aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.1.0684: warnings from 64-bit compiler

Browse Source 
Problem:    Warnings from 64-bit compiler.
Solution:   Add type casts. (Mike Williams)
This commit is contained in:
Bram Moolenaar
2019-01-03 21:55:32 +01:00
parent 637532b3c0
commit 4b7214ea78
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/memline.c
View File

@@ -562,7 +562,7 @@ ml_set_crypt_key(
/* Skip data block with negative block number.
* Should not happen, because of the ml_preserve()
* above. Get same block again for next index. */
++idx;
++idx;
continue;
}
@@ -3350,7 +3350,7 @@ adjust_text_props_for_delete(
internal_error("no text property below deleted line");
return;
}
this_props_len = line_size - textlen;
this_props_len = line_size - (int)textlen;
}
found = FALSE;
@@ -3489,7 +3489,7 @@ ml_delete_int(buf_T *buf, linenr_T lnum, int message)
if ((long)textlen < line_size)
{
textprop_save_len = line_size - textlen;
textprop_save_len = line_size - (int)textlen;
textprop_save = vim_memsave((char_u *)dp + line_start + textlen,
textprop_save_len);
}
@@ -5379,7 +5379,7 @@ ml_updatechunk(
// the text prop info would also be counted. Go over the
// lines.
for (i = end_idx; i < idx; ++i)
size += STRLEN((char_u *)dp + (dp->db_index[i] & DB_INDEX_MASK)) + 1;
size += (int)STRLEN((char_u *)dp + (dp->db_index[i] & DB_INDEX_MASK)) + 1;
}
else
#endif
@@ -5588,7 +5588,7 @@ ml_find_line_or_offset(buf_T *buf, linenr_T lnum, long *offp)
// lengths.
len = 0;
for (i = start_idx; i <= idx; ++i)
len += STRLEN((char_u *)dp + ((dp->db_index[i]) & DB_INDEX_MASK)) + 1;
len += (int)STRLEN((char_u *)dp + ((dp->db_index[i]) & DB_INDEX_MASK)) + 1;
}
else
#endif

6
src/textprop.c
View File

@@ -262,9 +262,9 @@ f_prop_add(typval_T *argvars, typval_T *rettv UNUSED)
if (lnum == end_lnum)
length = end_col - col;
else
length = textlen - col + 1;
length = (int)textlen - col + 1;
if (length > (long)textlen)
length = textlen; // can include the end-of-line
length = (int)textlen; // can include the end-of-line
if (length < 0)
length = 0; // zero-width property
@@ -972,7 +972,7 @@ adjust_prop_columns(
if (dirty)
{
curbuf->b_ml.ml_flags |= ML_LINE_DIRTY;
curbuf->b_ml.ml_line_len = textlen + wi * sizeof(textprop_T);
curbuf->b_ml.ml_line_len = (int)textlen + wi * sizeof(textprop_T);
}
}

2
src/version.c
View File

@@ -799,6 +799,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
684,
/**/
683,
/**/