wyj/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-09-17 20:58:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(optionstr.c): remove redundant argument

Browse Source
This commit is contained in:
Lewis Russell 2023-07-12 14:16:29 +01:00
parent 3b02e1281a
commit 9fdc4cdb64
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/option.c
View File

@ -1172,7 +1172,7 @@ static void do_set_option_string(int opt_idx, int opt_flags, char **argp, int ne
// Handle side effects, and set the global value for ":set" on local
// options. Note: when setting 'syntax' or 'filetype' autocommands may
// be triggered that can cause havoc.
*errmsg = did_set_string_option(curbuf, curwin, opt_idx, (char **)varp, oldval, newval,
*errmsg = did_set_string_option(curbuf, curwin, opt_idx, (char **)varp, oldval,
errbuf, errbuflen,
opt_flags, value_checked);

12
src/nvim/optionstr.c
View File

@ -437,7 +437,6 @@ const char *set_string_option(const int opt_idx, const char *const value, const
return NULL;
}
char *const s = xstrdup(value);
char **const varp
= (char **)get_varp_scope(opt, ((opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0
? ((opt->indir & PV_BOTH) ? OPT_GLOBAL : OPT_LOCAL)
@ -451,15 +450,15 @@ const char *set_string_option(const int opt_idx, const char *const value, const
oldval_g = *(char **)get_varp_scope(opt, OPT_GLOBAL);
}
*varp = s;
*varp = xstrdup(value);
char *const saved_oldval = xstrdup(oldval);
char *const saved_oldval_l = (oldval_l != NULL) ? xstrdup(oldval_l) : 0;
char *const saved_oldval_g = (oldval_g != NULL) ? xstrdup(oldval_g) : 0;
char *const saved_newval = xstrdup(s);
char *const saved_newval = xstrdup(*varp);
int value_checked = false;
const char *const errmsg = did_set_string_option(curbuf, curwin, opt_idx, varp, oldval, s, errbuf,
const char *const errmsg = did_set_string_option(curbuf, curwin, opt_idx, varp, oldval, errbuf,
errbuflen, opt_flags, &value_checked);
if (errmsg == NULL) {
did_set_option(opt_idx, opt_flags, true, value_checked);
@ -2067,8 +2066,7 @@ static void do_spelllang_source(win_T *win)
///
/// @return NULL for success, or an untranslated error message for an error
const char *did_set_string_option(buf_T *buf, win_T *win, int opt_idx, char **varp, char *oldval,
const char *value, char *errbuf, size_t errbuflen, int opt_flags,
int *value_checked)
char *errbuf, size_t errbuflen, int opt_flags, int *value_checked)
{
const char *errmsg = NULL;
int restore_chartab = false;
@ -2082,7 +2080,7 @@ const char *did_set_string_option(buf_T *buf, win_T *win, int opt_idx, char **va
.os_idx = opt_idx,
.os_flags = opt_flags,
.os_oldval.string = oldval,
.os_newval.string = value,
.os_newval.string = *varp,
.os_value_checked = false,
.os_value_changed = false,
.os_restore_chartab = false,