summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-10-26 18:46:53 +0100
committerBram Moolenaar <Bram@vim.org>2020-10-26 18:46:53 +0100
commita360dbe3b63bdca93bbf8cc431578a446e8ce14c (patch)
tree617a7abad70fa0860fd889acad723f6521a7bc42
parent4882d983397057ea91c584c5a54aaccf15016d18 (diff)
downloadvim-git-a360dbe3b63bdca93bbf8cc431578a446e8ce14c.tar.gz
patch 8.2.1906: warning for signed/unsignedv8.2.1906
Problem: Warning for signed/unsigned. Solution: Use size_t instead of int. (Mike Williams)
-rw-r--r--src/proto/usercmd.pro2
-rw-r--r--src/usercmd.c4
-rw-r--r--src/version.c2
-rw-r--r--src/vim9execute.c2
4 files changed, 6 insertions, 4 deletions
diff --git a/src/proto/usercmd.pro b/src/proto/usercmd.pro
index d24e9ad94..9e16a80e6 100644
--- a/src/proto/usercmd.pro
+++ b/src/proto/usercmd.pro
@@ -15,6 +15,6 @@ void ex_comclear(exarg_T *eap);
void uc_clear(garray_T *gap);
void ex_delcommand(exarg_T *eap);
size_t add_win_cmd_modifers(char_u *buf, cmdmod_T *cmod, int *multi_mods);
-int produce_cmdmods(char_u *buf, cmdmod_T *cmod, int quote);
+size_t produce_cmdmods(char_u *buf, cmdmod_T *cmod, int quote);
void do_ucmd(exarg_T *eap);
/* vim: set ft=c : */
diff --git a/src/usercmd.c b/src/usercmd.c
index ac013300f..82b19bb04 100644
--- a/src/usercmd.c
+++ b/src/usercmd.c
@@ -1269,10 +1269,10 @@ add_win_cmd_modifers(char_u *buf, cmdmod_T *cmod, int *multi_mods)
* Generate text for the "cmod" command modifiers.
* If "buf" is NULL just return the length.
*/
- int
+ size_t
produce_cmdmods(char_u *buf, cmdmod_T *cmod, int quote)
{
- int result = 0;
+ size_t result = 0;
int multi_mods = 0;
int i;
typedef struct {
diff --git a/src/version.c b/src/version.c
index 1cde8c724..4acc9c498 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1906,
+/**/
1905,
/**/
1904,
diff --git a/src/vim9execute.c b/src/vim9execute.c
index 10746b1c0..341e5d02a 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -3530,7 +3530,7 @@ ex_disassemble(exarg_T *eap)
case ISN_CMDMOD:
{
char_u *buf;
- int len = produce_cmdmods(
+ size_t len = produce_cmdmods(
NULL, iptr->isn_arg.cmdmod.cf_cmdmod, FALSE);
buf = alloc(len + 1);