diff options
| author | erw7 <erw7.github@gmail.com> | 2020-07-26 12:27:58 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-26 12:27:58 +0900 |
| commit | 33eaa171fad0c8b729b0db14eef3173dbd8c950b (patch) | |
| tree | 3ceb6f0aabe9cd450c96787bb03a9e863d6e2c4c /src | |
| parent | 44cbf288ec4407c6fddf79b6b39041d5bbee940b (diff) | |
| parent | e0afec8a626d72d074f80bdbbc2cc753802ecaa4 (diff) | |
| download | rneovim-33eaa171fad0c8b729b0db14eef3173dbd8c950b.tar.gz rneovim-33eaa171fad0c8b729b0db14eef3173dbd8c950b.tar.bz2 rneovim-33eaa171fad0c8b729b0db14eef3173dbd8c950b.zip | |
Merge pull request #12673 from erw7/fix-tv-dict-add-str
typval: fix incompatibility with vim
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval/typval.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c index ef8e66a992..8dde78de3d 100644 --- a/src/nvim/eval/typval.c +++ b/src/nvim/eval/typval.c @@ -1779,9 +1779,9 @@ int tv_dict_add_bool(dict_T *const d, const char *const key, int tv_dict_add_str(dict_T *const d, const char *const key, const size_t key_len, const char *const val) - FUNC_ATTR_NONNULL_ALL + FUNC_ATTR_NONNULL_ARG(1, 2) { - return tv_dict_add_allocated_str(d, key, key_len, xstrdup(val)); + return tv_dict_add_str_len(d, key, key_len, val, -1); } /// Add a string entry to dictionary @@ -1795,10 +1795,10 @@ int tv_dict_add_str(dict_T *const d, /// @return OK in case of success, FAIL when key already exists. int tv_dict_add_str_len(dict_T *const d, const char *const key, const size_t key_len, - char *const val, int len) + const char *const val, int len) FUNC_ATTR_NONNULL_ARG(1, 2) { - char *s = val ? val : ""; + char *s = NULL; if (val != NULL) { s = (len < 0) ? xstrdup(val) : xstrndup(val, (size_t)len); } @@ -1821,7 +1821,7 @@ int tv_dict_add_str_len(dict_T *const d, int tv_dict_add_allocated_str(dict_T *const d, const char *const key, const size_t key_len, char *const val) - FUNC_ATTR_NONNULL_ALL + FUNC_ATTR_NONNULL_ARG(1, 2) { dictitem_T *const item = tv_dict_item_alloc_len(key, key_len); |