aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.0601: a few compiler warnings

Browse Source 
Problem:    A few compiler warnings.
Solution:   Add type casts. (Mike Williams)
This commit is contained in:
Bram Moolenaar 2018-12-16 14:37:39 +01:00
parent d80232be54
commit 4efe73b478
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/GvimExt/gvimext.cpp
View File

@ -1084,7 +1084,6 @@ STDMETHODIMP CShellExt::InvokeSingleGvim(HWND hParent,
CloseHandle(pi.hProcess); CloseHandle(pi.hProcess);
CloseHandle(pi.hThread); CloseHandle(pi.hThread);
} }
theend:
free(cmdStrW); free(cmdStrW);
return NOERROR; return NOERROR;

6
src/memline.c
View File

@ -3146,7 +3146,7 @@ ml_replace(linenr_T lnum, char_u *line, int copy)
colnr_T len = -1; colnr_T len = -1;
if (line != NULL) if (line != NULL)
len = STRLEN(line); len = (colnr_T)STRLEN(line);
return ml_replace_len(lnum, line, len, copy); return ml_replace_len(lnum, line, len, copy);
} }
@ -3196,14 +3196,14 @@ ml_replace_len(linenr_T lnum, char_u *line_arg, colnr_T len_arg, int copy)
size_t textproplen = curbuf->b_ml.ml_line_len - oldtextlen; size_t textproplen = curbuf->b_ml.ml_line_len - oldtextlen;
// Need to copy over text properties, stored after the text. // Need to copy over text properties, stored after the text.
newline = alloc(len + 1 + textproplen); newline = alloc(len + 1 + (int)textproplen);
if (newline != NULL) if (newline != NULL)
{ {
mch_memmove(newline, line, len + 1); mch_memmove(newline, line, len + 1);
mch_memmove(newline + len + 1, curbuf->b_ml.ml_line_ptr + oldtextlen, textproplen); mch_memmove(newline + len + 1, curbuf->b_ml.ml_line_ptr + oldtextlen, textproplen);
vim_free(line); vim_free(line);
line = newline; line = newline;
len += textproplen; len += (colnr_T)textproplen;
} }
} }
} }

10
src/textprop.c
View File

@ -301,7 +301,7 @@ get_text_props(buf_T *buf, linenr_T lnum, char_u **props, int will_change)
} }
if (proplen > 0) if (proplen > 0)
*props = text + textlen; *props = text + textlen;
return proplen / sizeof(textprop_T); return (int)(proplen / sizeof(textprop_T));
} }
static proptype_T * static proptype_T *
@ -393,7 +393,7 @@ f_prop_clear(typval_T *argvars, typval_T *rettv UNUSED)
buf->b_ml.ml_line_ptr = newtext; buf->b_ml.ml_line_ptr = newtext;
buf->b_ml.ml_flags |= ML_LINE_DIRTY; buf->b_ml.ml_flags |= ML_LINE_DIRTY;
} }
buf->b_ml.ml_line_len = len; buf->b_ml.ml_line_len = (int)len;
} }
} }
redraw_buf_later(buf, NOT_VALID); redraw_buf_later(buf, NOT_VALID);
@ -423,8 +423,8 @@ f_prop_list(typval_T *argvars, typval_T *rettv)
{ {
char_u *text = ml_get_buf(buf, lnum, FALSE); char_u *text = ml_get_buf(buf, lnum, FALSE);
size_t textlen = STRLEN(text) + 1; size_t textlen = STRLEN(text) + 1;
int count = (buf->b_ml.ml_line_len - textlen) int count = (int)((buf->b_ml.ml_line_len - textlen)
/ sizeof(textprop_T); / sizeof(textprop_T));
int i; int i;
textprop_T prop; textprop_T prop;
proptype_T *pt; proptype_T *pt;
@ -607,7 +607,7 @@ prop_type_set(typval_T *argvars, int add)
EMSG2(_("E969: Property type %s already defined"), name); EMSG2(_("E969: Property type %s already defined"), name);
return; return;
} }
prop = (proptype_T *)alloc_clear(sizeof(proptype_T) + STRLEN(name)); prop = (proptype_T *)alloc_clear((int)(sizeof(proptype_T) + STRLEN(name)));
if (prop == NULL) if (prop == NULL)
return; return;
STRCPY(prop->pt_name, name); STRCPY(prop->pt_name, name);

2
src/version.c
View File

@ -799,6 +799,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 */
/**/
601,
/**/ /**/
600, 600,
/**/ /**/