Mercurial > vim
changeset 33881:2f9090601258 v9.0.2150
patch 9.0.2150: Using int for errbuflen in option funcs
Commit: https://github.com/vim/vim/commit/620f0116948ddd9f1900f067ed8bb6bab548f825
Author: Mike Williams <mikew@globalgraphics.com>
Date: Tue Dec 5 15:36:06 2023 +0100
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>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 10 Dec 2023 15:16:19 +0100 |
| parents | f39f120aa33e |
| children | 5b6b51bd1b1f |
| files | src/option.c src/optionstr.c src/proto/optionstr.pro src/structs.h src/version.c |
| diffstat | 5 files changed, 10 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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) {
--- 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
--- 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);