diff options
| author | ZyX <kp-pav@yandex.ru> | 2015-08-17 21:29:13 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2015-10-08 22:00:49 +0300 |
| commit | 127e63fc17c093298bbb3ae3640d991857a2bd61 (patch) | |
| tree | 1a5c1a31ae840edd72360d284b96ea5b1ea5aa8b | |
| parent | b87c65d7b96ef0290764362fb7b1102b978653f9 (diff) | |
| download | rneovim-127e63fc17c093298bbb3ae3640d991857a2bd61.tar.gz rneovim-127e63fc17c093298bbb3ae3640d991857a2bd61.tar.bz2 rneovim-127e63fc17c093298bbb3ae3640d991857a2bd61.zip | |
shada: Use same iteration end conditions as with other iterators
| -rw-r--r-- | src/nvim/eval.c | 1 | ||||
| -rw-r--r-- | src/nvim/shada.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 25ead0c201..d2d195155d 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -20909,7 +20909,6 @@ const void *var_shada_iter(const void *const iter, const char **const name, hi++; } if ((size_t) (hi - hifirst) == hinum) { - *rettv = (typval_T) { .v_type = VAR_UNKNOWN }; return NULL; } } else { diff --git a/src/nvim/shada.c b/src/nvim/shada.c index 654b6dde41..76ae82e309 100644 --- a/src/nvim/shada.c +++ b/src/nvim/shada.c @@ -2483,9 +2483,9 @@ static ShaDaWriteResult shada_write(ShaDaWriteDef *const sd_writer, const Timestamp cur_timestamp = os_time(); do { typval_T vartv; - const char *name; + const char *name = NULL; var_iter = var_shada_iter(var_iter, &name, &vartv); - if (var_iter == NULL && vartv.v_type == VAR_UNKNOWN) { + if (name == NULL) { break; } typval_T tgttv; |