aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorerw7 <erw7.github@gmail.com>2020-07-23 12:58:22 +0900
committererw7 <erw7.github@gmail.com>2020-07-23 14:51:37 +0900
commite0afec8a626d72d074f80bdbbc2cc753802ecaa4 (patch)
tree5f3bc5b53c034cab56973aa9afb8e270e0144b02 /src
parent326b87feb6179d1b36375844eab493e0bb4dbf7f (diff)
downloadrneovim-e0afec8a626d72d074f80bdbbc2cc753802ecaa4.tar.gz
rneovim-e0afec8a626d72d074f80bdbbc2cc753802ecaa4.tar.bz2
rneovim-e0afec8a626d72d074f80bdbbc2cc753802ecaa4.zip
typval: fix incompatibility with vim
The dict_add_string of vim accepts NULL as the value to add. But tv_dict_add_str didn't accept it. Change it to accept NULL as well as vim.
Diffstat (limited to 'src')
-rw-r--r--src/nvim/eval/typval.c10
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);