patch 9.0.2150: Using int for errbuflen in option funcs

Problem:  Using int for errbuflen in option funcs
Solution: Use size_t for errbuflen in string option functions

Use size_t for errbuflen in string option functions

This started as size_t to int warning on Windows in
do_set_option_string().  Other option setting functions are using size_t
for errbuflen so I changed the type in the argument list and then chased
further compiler warnings into the string option functions in
optionstr.c changing ints to size_t as I went.

I also changed the type of os_errbuflen in optset_T to size_t and
updated related argument lists in optionstr.c, as well as updating
set_string_option() to also use size_t for errbuflen for consistency
with other string option setting functions.

closes: #13628

Signed-off-by: Mike Williams <mikew@globalgraphics.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/option.c b/src/option.c
index 98bac5a8ff23bc449f5e2388286d699145227819..df81cf33bdaa811a5b8f72bc29cb6ce9cf821248 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -1932,7 +1932,7 @@ do_set_option_string(
        int         cp_val,
        char_u      *varp_arg,
        char        *errbuf,
-       int         errbuflen,
+       size_t      errbuflen,
        int         *value_checked,
        char        **errmsg)
 {

diff --git a/src/optionstr.c b/src/optionstr.c
index 84c77cb0a0e2592fb07a52261c461318137d25e8..d8e22c03781d9b77d235bf0095e8222322934903 100644 (file)
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -229,7 +229,7 @@ trigger_optionset_string(
 #endif
 
     static char *
-illegal_char(char *errbuf, int errbuflen, int c)
+illegal_char(char *errbuf, size_t errbuflen, int c)
 {
     if (errbuf == NULL)
        return "";
@@ -527,7 +527,7 @@ set_string_option(
     char_u     *value,
     int                opt_flags,      // OPT_LOCAL and/or OPT_GLOBAL
     char       *errbuf,
-    int                errbuflen)
+    size_t     errbuflen)
 {
     char_u     *s;
     char_u     **varp;
@@ -726,7 +726,7 @@ did_set_option_listflag(
        char_u *val,
        char_u *flags,
        char *errbuf,
-       int errbuflen)
+       size_t errbuflen)
 {
     char_u     *s;
 
@@ -4354,7 +4354,7 @@ did_set_string_option(
     char_u     *oldval,                // previous value of the option
     char_u     *value,                 // new value of the option
     char       *errbuf,                // buffer for errors, or NULL
-    int                errbuflen,              // length of error buffer
+    size_t     errbuflen,              // length of error buffer
     int                opt_flags,              // OPT_LOCAL and/or OPT_GLOBAL
     set_op_T    op,                    // OP_ADDING/OP_PREPENDING/OP_REMOVING
     int                *value_checked)         // value was checked to be safe, no

diff --git a/src/proto/optionstr.pro b/src/proto/optionstr.pro
index 4ce93212dd948f6cd5ec9381976d354f93516a1a..fecfcb1a230d77bbd49cfb8d6e132a9f49132933 100644 (file)
--- a/src/proto/optionstr.pro
+++ b/src/proto/optionstr.pro
@@ -8,7 +8,7 @@ void check_string_option(char_u **pp);
 void set_string_option_direct(char_u *name, int opt_idx, char_u *val, int opt_flags, int set_sid);
 void set_string_option_direct_in_win(win_T *wp, char_u *name, int opt_idx, char_u *val, int opt_flags, int set_sid);
 void set_string_option_direct_in_buf(buf_T *buf, char_u *name, int opt_idx, char_u *val, int opt_flags, int set_sid);
-char *set_string_option(int opt_idx, char_u *value, int opt_flags, char *errbuf, int errbuflen);
+char *set_string_option(int opt_idx, char_u *value, int opt_flags, char *errbuf, size_t errbuflen);
 char *did_set_ambiwidth(optset_T *args);
 char *did_set_background(optset_T *args);
 char *did_set_backspace(optset_T *args);
@@ -121,7 +121,7 @@ char *did_set_wildmode(optset_T *args);
 char *did_set_wildoptions(optset_T *args);
 char *did_set_winaltkeys(optset_T *args);
 char *did_set_wincolor(optset_T *args);
-char *did_set_string_option(int opt_idx, char_u **varp, char_u *oldval, char_u *value, char *errbuf, int errbuflen, int opt_flags, set_op_T op, int *value_checked);
+char *did_set_string_option(int opt_idx, char_u **varp, char_u *oldval, char_u *value, char *errbuf, size_t errbuflen, int opt_flags, set_op_T op, int *value_checked);
 int expand_set_ambiwidth(optexpand_T *args, int *numMatches, char_u ***matches);
 int expand_set_background(optexpand_T *args, int *numMatches, char_u ***matches);
 int expand_set_backspace(optexpand_T *args, int *numMatches, char_u ***matches);

diff --git a/src/structs.h b/src/structs.h
index 6d9dcbb2ab17d6212d560be60b172d9a5d8e7668..de02bc6645a8866b67d02b62db8575698b6f36f7 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -4969,7 +4969,7 @@ typedef struct
     // message (when it is not NULL).
     char       *os_errbuf;
     // length of the error buffer
-    int                os_errbuflen;
+    size_t     os_errbuflen;
 } optset_T;
 
 /*

diff --git a/src/version.c b/src/version.c
index 064b8137f5c5dd213b12360147faecf674db8fae..16d13b9fe065759238f937cc4581991e11d9fddb 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2150,
 /**/
     2149,
 /**/