diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2019-07-19 20:15:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-19 20:15:03 +0200 |
| commit | d5f7099be23e217a1fe1f5443257f1b5d1eacfea (patch) | |
| tree | 3f6408beb26e7c34f95fa05c5d84b1ac7ad880c1 /src/nvim/eval.c | |
| parent | 7e4fd045f943156882f5efa502998d2f670fe256 (diff) | |
| parent | aa28e070e9f953c26405d765addd9f780ede2c5a (diff) | |
| download | rneovim-d5f7099be23e217a1fe1f5443257f1b5d1eacfea.tar.gz rneovim-d5f7099be23e217a1fe1f5443257f1b5d1eacfea.tar.bz2 rneovim-d5f7099be23e217a1fe1f5443257f1b5d1eacfea.zip | |
Merge pull request #10541 from bfredl/conversion_getln
refactor: enable -Wconversion for ex_getln.c and use int for Rows/Columns
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index e244930ba5..2dc6a287a1 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -10026,13 +10026,13 @@ static void f_getcompletion(typval_T *argvars, typval_T *rettv, FunPtr fptr) if (strcmp(tv_get_string(&argvars[1]), "cmdline") == 0) { set_one_cmd_context(&xpc, tv_get_string(&argvars[0])); - xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern); + xpc.xp_pattern_len = STRLEN(xpc.xp_pattern); goto theend; } ExpandInit(&xpc); xpc.xp_pattern = (char_u *)tv_get_string(&argvars[0]); - xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern); + xpc.xp_pattern_len = STRLEN(xpc.xp_pattern); xpc.xp_context = cmdcomplete_str_to_type( (char_u *)tv_get_string(&argvars[1])); if (xpc.xp_context == EXPAND_NOTHING) { @@ -10042,17 +10042,17 @@ static void f_getcompletion(typval_T *argvars, typval_T *rettv, FunPtr fptr) if (xpc.xp_context == EXPAND_MENUS) { set_context_in_menu_cmd(&xpc, (char_u *)"menu", xpc.xp_pattern, false); - xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern); + xpc.xp_pattern_len = STRLEN(xpc.xp_pattern); } if (xpc.xp_context == EXPAND_CSCOPE) { set_context_in_cscope_cmd(&xpc, (const char *)xpc.xp_pattern, CMD_cscope); - xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern); + xpc.xp_pattern_len = STRLEN(xpc.xp_pattern); } if (xpc.xp_context == EXPAND_SIGN) { set_context_in_sign_cmd(&xpc, xpc.xp_pattern); - xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern); + xpc.xp_pattern_len = STRLEN(xpc.xp_pattern); } theend: @@ -21138,7 +21138,8 @@ void ex_function(exarg_T *eap) goto erret; } if (show_block) { - ui_ext_cmdline_block_append(indent, (const char *)theline); + assert(indent >= 0); + ui_ext_cmdline_block_append((size_t)indent, (const char *)theline); } /* Detect line continuation: sourcing_lnum increased more than one. */ |