aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-05 05:34:07 -04:00
Code Activity

patch 8.1.1376: warnings for size_t/int mixups

Browse Source 
Problem:    Warnings for size_t/int mixups.
Solution:   Change types, add type casts. (Mike Williams)
This commit is contained in:
Bram Moolenaar
2019-05-24 13:22:22 +02:00
parent 984f031fb0
commit e2ad826f43
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/search.c
View File

@@ -4990,7 +4990,7 @@ search_stat(
if (cur > 0) if (cur > 0)
{ {
char t[SEARCH_STAT_BUF_LEN] = ""; char t[SEARCH_STAT_BUF_LEN] = "";
int len; size_t len;
#ifdef FEAT_RIGHTLEFT #ifdef FEAT_RIGHTLEFT
if (curwin->w_p_rl && *curwin->w_p_rlc == 's') if (curwin->w_p_rl && *curwin->w_p_rlc == 's')

8
src/textprop.c
View File

@@ -1203,7 +1203,7 @@ join_prop_lines(
size_t oldproplen; size_t oldproplen;
char_u *props; char_u *props;
int i; int i;
int len; size_t len;
char_u *line; char_u *line;
size_t l; size_t l;
@@ -1218,8 +1218,8 @@ join_prop_lines(
// get existing properties of the joined line // get existing properties of the joined line
oldproplen = get_text_props(curbuf, lnum, &props, FALSE); oldproplen = get_text_props(curbuf, lnum, &props, FALSE);
len = (int)STRLEN(newp) + 1; len = STRLEN(newp) + 1;
line = alloc(len + (oldproplen + proplen) * (int)sizeof(textprop_T)); line = alloc((int)(len + (oldproplen + proplen) * sizeof(textprop_T)));
if (line == NULL) if (line == NULL)
return; return;
mch_memmove(line, newp, len); mch_memmove(line, newp, len);
@@ -1236,7 +1236,7 @@ join_prop_lines(
vim_free(prop_lines[i]); vim_free(prop_lines[i]);
} }
ml_replace_len(lnum, line, len, TRUE, FALSE); ml_replace_len(lnum, line, (colnr_T)len, TRUE, FALSE);
vim_free(newp); vim_free(newp);
vim_free(prop_lines); vim_free(prop_lines);
vim_free(prop_lengths); vim_free(prop_lengths);

2
src/version.c
View File

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