aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval
diff options
context:
space:
mode:
authorFamiu Haque <famiuhaque@proton.me>2025-01-01 19:45:14 +0600
committerGitHub <noreply@github.com>2025-01-01 07:45:14 -0600
commit9d114b720514b0bde96dbdd9b6ef328d232a1589 (patch)
tree6f0dacc350b3d5a4a987cb5ab38073bbe2b8e10d /src/nvim/eval
parent59cbe640233eeb6ae96231e059449e73e15f9ea5 (diff)
downloadrneovim-9d114b720514b0bde96dbdd9b6ef328d232a1589.tar.gz
rneovim-9d114b720514b0bde96dbdd9b6ef328d232a1589.tar.bz2
rneovim-9d114b720514b0bde96dbdd9b6ef328d232a1589.zip
refactor(options): use `const` in more places (#31791)
Diffstat (limited to 'src/nvim/eval')
-rw-r--r--src/nvim/eval/vars.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/nvim/eval/vars.c b/src/nvim/eval/vars.c
index 6504d44eb6..b9b5a055fb 100644
--- a/src/nvim/eval/vars.c
+++ b/src/nvim/eval/vars.c
@@ -872,11 +872,15 @@ static char *ex_let_option(char *arg, typval_T *const tv, const bool is_const,
} else {
newval = BOOLEAN_OPTVAL(TRISTATE_FROM_INT(new_n));
}
- } else if (!hidden && is_string
- && curval.data.string.data != NULL && newval.data.string.data != NULL) { // string
- OptVal newval_old = newval;
- newval = CSTR_AS_OPTVAL(concat_str(curval.data.string.data, newval.data.string.data));
- optval_free(newval_old);
+ } else if (!hidden && is_string) { // string
+ const char *curval_data = curval.data.string.data;
+ const char *newval_data = newval.data.string.data;
+
+ if (curval_data != NULL && newval_data != NULL) {
+ OptVal newval_old = newval;
+ newval = CSTR_AS_OPTVAL(concat_str(curval_data, newval_data));
+ optval_free(newval_old);
+ }
}
}