kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-31 17:13:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

refactor(option.c): factor out option prefix parsing

Browse Source
This commit is contained in:
Lewis Russell 2023-01-25 17:28:21 +00:00
parent 0f3fa5a30a
commit 9a9129c60b
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/nvim/option.c
View File

@ -1179,18 +1179,24 @@ static set_op_T get_op(const char *arg)
return op; return op;
} }
static int get_option_prefix(char **argp)
{
if (strncmp(*argp, "no", 2) == 0) {
*argp += 2;
return 0;
} else if (strncmp(*argp, "inv", 3) == 0) {
*argp += 3;
return 2;
}
return 1;
}
static void do_set_option(int opt_flags, char **argp, bool *did_show, char *errbuf, static void do_set_option(int opt_flags, char **argp, bool *did_show, char *errbuf,
size_t errbuflen, char **errmsg) size_t errbuflen, char **errmsg)
{ {
int prefix = 1; // 1: nothing, 0: "no", 2: "inv" in front of name // 1: nothing, 0: "no", 2: "inv" in front of name
int prefix = get_option_prefix(argp);
if (strncmp(*argp, "no", 2) == 0) {
prefix = 0;
*argp += 2;
} else if (strncmp(*argp, "inv", 3) == 0) {
prefix = 2;
*argp += 3;
}
char *arg = *argp; char *arg = *argp;
@ -1221,11 +1227,11 @@ static void do_set_option(int opt_flags, char **argp, bool *did_show, char *errb
key = find_key_option(arg + 1, true); key = find_key_option(arg + 1, true);
} }
} else { } else {
len = 0;
// The two characters after "t_" may not be alphanumeric. // The two characters after "t_" may not be alphanumeric.
if (arg[0] == 't' && arg[1] == '_' && arg[2] && arg[3]) { if (arg[0] == 't' && arg[1] == '_' && arg[2] && arg[3]) {
len = 4; len = 4;
} else { } else {
len = 0;
while (ASCII_ISALNUM(arg[len]) || arg[len] == '_') { while (ASCII_ISALNUM(arg[len]) || arg[len] == '_') {
len++; len++;
} }