aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2017-04-16 20:07:54 +0300
committerZyX <kp-pav@yandex.ru>2017-04-16 20:07:54 +0300
commit31190879cc85cb3e8a056d544ea0c3ed63ce21df (patch)
tree3e77abfabd7e28d4b6b4f86fc55c08bc73058b40
parent7c9e3d6cadb441aaa40c8539de41e302228196a9 (diff)
downloadrneovim-31190879cc85cb3e8a056d544ea0c3ed63ce21df.tar.gz
rneovim-31190879cc85cb3e8a056d544ea0c3ed63ce21df.tar.bz2
rneovim-31190879cc85cb3e8a056d544ea0c3ed63ce21df.zip
eval: Fix useless NULL check
partial_name() as it is written now really cannot return NULL
-rw-r--r--src/nvim/eval.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index bfc9f6eaa6..f8afc03c1c 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -8977,13 +8977,10 @@ static void f_get(typval_T *argvars, typval_T *rettv, FunPtr fptr)
if (strcmp(what, "func") == 0 || strcmp(what, "name") == 0) {
rettv->v_type = (*what == 'f' ? VAR_FUNC : VAR_STRING);
const char *const n = (const char *)partial_name(pt);
- if (n == NULL) {
- rettv->vval.v_string = NULL;
- } else {
- rettv->vval.v_string = (char_u *)xstrdup(n);
- if (rettv->v_type == VAR_FUNC) {
- func_ref(rettv->vval.v_string);
- }
+ assert(n != NULL);
+ rettv->vval.v_string = (char_u *)xstrdup(n);
+ if (rettv->v_type == VAR_FUNC) {
+ func_ref(rettv->vval.v_string);
}
} else if (strcmp(what, "dict") == 0) {
rettv->v_type = VAR_DICT;