diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-12-16 14:37:39 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-12-16 14:37:39 +0100 |
| commit | 4efe73b478d3ba689078da502fd96f45204ff1f5 (patch) | |
| tree | c205c34c6eae39caa184af7b7a076df3bdab65f7 | |
| parent | d80232be5428f9df889f4e977e24117e162de67a (diff) | |
patch 8.1.0601: a few compiler warningsv8.1.0601
Problem: A few compiler warnings.
Solution: Add type casts. (Mike Williams)
| -rw-r--r-- | src/GvimExt/gvimext.cpp | 1 | ||||
| -rw-r--r-- | src/memline.c | 6 | ||||
| -rw-r--r-- | src/textprop.c | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/src/GvimExt/gvimext.cpp b/src/GvimExt/gvimext.cpp index 30b2dddb67..b9d9d91f01 100644 --- a/src/GvimExt/gvimext.cpp +++ b/src/GvimExt/gvimext.cpp @@ -1084,7 +1084,6 @@ STDMETHODIMP CShellExt::InvokeSingleGvim(HWND hParent, CloseHandle(pi.hProcess); CloseHandle(pi.hThread); } -theend: free(cmdStrW); return NOERROR; diff --git a/src/memline.c b/src/memline.c index 0eb31c3c5c..eaa3b65aba 100644 --- a/src/memline.c +++ b/src/memline.c @@ -3146,7 +3146,7 @@ ml_replace(linenr_T lnum, char_u *line, int copy) colnr_T len = -1; if (line != NULL) - len = STRLEN(line); + len = (colnr_T)STRLEN(line); 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; // Need to copy over text properties, stored after the text. - newline = alloc(len + 1 + textproplen); + newline = alloc(len + 1 + (int)textproplen); if (newline != NULL) { mch_memmove(newline, line, len + 1); mch_memmove(newline + len + 1, curbuf->b_ml.ml_line_ptr + oldtextlen, textproplen); vim_free(line); line = newline; - len += textproplen; + len += (colnr_T)textproplen; } } } diff --git a/src/textprop.c b/src/textprop.c index 3e0207da37..05df2e1398 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -301,7 +301,7 @@ get_text_props(buf_T *buf, linenr_T lnum, char_u **props, int will_change) } if (proplen > 0) *props = text + textlen; - return proplen / sizeof(textprop_T); + return (int)(proplen / sizeof(textprop_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_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); @@ -423,8 +423,8 @@ f_prop_list(typval_T *argvars, typval_T *rettv) { char_u *text = ml_get_buf(buf, lnum, FALSE); size_t textlen = STRLEN(text) + 1; - int count = (buf->b_ml.ml_line_len - textlen) - / sizeof(textprop_T); + int count = (int)((buf->b_ml.ml_line_len - textlen) + / sizeof(textprop_T)); int i; textprop_T prop; proptype_T *pt; @@ -607,7 +607,7 @@ prop_type_set(typval_T *argvars, int add) EMSG2(_("E969: Property type %s already defined"), name); 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) return; STRCPY(prop->pt_name, name); diff --git a/src/version.c b/src/version.c index a485b2851c..5db1001521 100644 --- a/src/version.c +++ b/src/version.c @@ -800,6 +800,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 601, +/**/ 600, /**/ 599, |