diff options
| author | Lewis Russell <lewis6991@gmail.com> | 2023-01-25 14:36:46 +0000 |
|---|---|---|
| committer | Lewis Russell <lewis6991@gmail.com> | 2023-01-26 09:51:45 +0000 |
| commit | 9679d058d42c22179fe3cf56e97983b2e67fb3f3 (patch) | |
| tree | e7726e7e08e8222eaf7050c9bdc6ede519a9cdb3 /src | |
| parent | ca1ad8977c9e1c79666978aef905c2a2a7f5c16e (diff) | |
| download | rneovim-9679d058d42c22179fe3cf56e97983b2e67fb3f3.tar.gz rneovim-9679d058d42c22179fe3cf56e97983b2e67fb3f3.tar.bz2 rneovim-9679d058d42c22179fe3cf56e97983b2e67fb3f3.zip | |
refactor(option.c): simplify do_set_string
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/option.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index c02c30c413..84bc72e834 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -831,10 +831,9 @@ static void do_set_num(int opt_idx, int opt_flags, char **argp, int nextchar, co } /// Part of do_set() for string options. -/// @return FAIL on failure, do not process further options. -static int do_set_string(int opt_idx, int opt_flags, char **argp, int nextchar, set_op_T op_arg, - uint32_t flags, char *varp_arg, char *errbuf, size_t errbuflen, - int *value_checked, char **errmsg) +static void do_set_string(int opt_idx, int opt_flags, char **argp, int nextchar, set_op_T op_arg, + uint32_t flags, char *varp_arg, char *errbuf, size_t errbuflen, + int *value_checked, char **errmsg) { char *arg = *argp; set_op_T op = op_arg; @@ -1163,7 +1162,6 @@ static int do_set_string(int opt_idx, int opt_flags, char **argp, int nextchar, xfree(saved_newval); *argp = arg; - return *errmsg == NULL ? OK : FAIL; } /// Parse 'arg' for option settings. @@ -1429,13 +1427,10 @@ int do_set(char *arg, int opt_flags) goto skip; } } else if (opt_idx >= 0) { // String. - if (do_set_string(opt_idx, opt_flags, &arg, nextchar, - op, flags, varp, errbuf, sizeof(errbuf), - &value_checked, &errmsg) == FAIL) { - if (errmsg != NULL) { - goto skip; - } - break; + do_set_string(opt_idx, opt_flags, &arg, nextchar, op, flags, varp, errbuf, + sizeof(errbuf), &value_checked, &errmsg); + if (errmsg != NULL) { + goto skip; } } else { // key code option(FIXME(tarruda): Show a warning or something |