mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-19 09:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #6480 from ZyX-I/colored-cmdline'/input-dict

Browse Source
This commit is contained in:
Justin M. Keyes
2017-05-13 21:17:33 +02:00
committed by GitHub
parent 7383274f66 d01f140bb3
commit 17531ed082
6 changed files with 541 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/nvim/eval/typval.c
View File

@@ -1210,7 +1210,8 @@ char *tv_dict_get_string(const dict_T *const d, const char *const key,
///
/// @param[in] d Dictionary to get item from.
/// @param[in] key Dictionary key.
/// @param[in] numbuf Numbuf for.
/// @param[in] numbuf Buffer for non-string items converted to strings, at
/// least of #NUMBUFLEN length.
///
/// @return NULL if key does not exist, empty string in case of type error,
/// string item value otherwise.
@@ -1225,6 +1226,32 @@ const char *tv_dict_get_string_buf(const dict_T *const d, const char *const key,
return tv_get_string_buf(&di->di_tv, numbuf);
}
/// Get a string item from a dictionary
///
/// @param[in] d Dictionary to get item from.
/// @param[in] key Dictionary key.
/// @param[in] key_len Key length.
/// @param[in] numbuf Buffer for non-string items converted to strings, at
/// least of #NUMBUFLEN length.
/// @param[in] def Default return when key does not exist.
///
/// @return `def` when key does not exist,
/// NULL in case of type error,
/// string item value in case of success.
const char *tv_dict_get_string_buf_chk(const dict_T *const d,
const char *const key,
const ptrdiff_t key_len,
char *const numbuf,
const char *const def)
FUNC_ATTR_WARN_UNUSED_RESULT
{
const dictitem_T *const di = tv_dict_find(d, key, key_len);
if (di == NULL) {
return def;
}
return tv_get_string_buf_chk(&di->di_tv, numbuf);
}
/// Get a function from a dictionary
///
/// @param[in] d Dictionary to get callback from.