mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(option.c): reduce scope or errmsg

Browse Source
This commit is contained in:
Lewis Russell
2023-01-25 14:53:42 +00:00
parent e368560c80
commit 3ae3e47d54
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/nvim/option.c
View File

@@ -1420,7 +1420,6 @@ int do_set(char *arg, int opt_flags)
char errbuf[80]; char errbuf[80];
while (*arg != NUL) { // loop to process all options while (*arg != NUL) { // loop to process all options
char *errmsg = NULL;
char *startarg = arg; // remember for error message char *startarg = arg; // remember for error message
if (strncmp(arg, "all", 3) == 0 && !ASCII_ISALPHA(arg[3]) if (strncmp(arg, "all", 3) == 0 && !ASCII_ISALPHA(arg[3])
@@ -1441,6 +1440,7 @@ int do_set(char *arg, int opt_flags)
did_show = true; did_show = true;
} }
} else { } else {
char *errmsg = NULL;
do_set_option(opt_flags, &arg, &did_show, errbuf, sizeof(errbuf), &errmsg); do_set_option(opt_flags, &arg, &did_show, errbuf, sizeof(errbuf), &errmsg);
// Advance to next argument. // Advance to next argument.
@@ -1458,26 +1458,26 @@ int do_set(char *arg, int opt_flags)
break; break;
} }
} }
}
if (errmsg != NULL) { if (errmsg != NULL) {
xstrlcpy(IObuff, _(errmsg), IOSIZE); xstrlcpy(IObuff, _(errmsg), IOSIZE);
int i = (int)strlen(IObuff) + 2; int i = (int)strlen(IObuff) + 2;
if (i + (arg - startarg) < IOSIZE) { if (i + (arg - startarg) < IOSIZE) {
// append the argument with the error // append the argument with the error
STRCAT(IObuff, ": "); STRCAT(IObuff, ": ");
assert(arg >= startarg); assert(arg >= startarg);
memmove(IObuff + i, startarg, (size_t)(arg - startarg)); memmove(IObuff + i, startarg, (size_t)(arg - startarg));
IObuff[i + (arg - startarg)] = NUL; IObuff[i + (arg - startarg)] = NUL;
}
// make sure all characters are printable
trans_characters(IObuff, IOSIZE);
no_wait_return++; // wait_return() done later
emsg(IObuff); // show error highlighted
no_wait_return--;
return FAIL;
} }
// make sure all characters are printable
trans_characters(IObuff, IOSIZE);
no_wait_return++; // wait_return() done later
emsg(IObuff); // show error highlighted
no_wait_return--;
return FAIL;
} }
arg = skipwhite(arg); arg = skipwhite(arg);