diff options
| author | Yegappan Lakshmanan <yegappan@yahoo.com> | 2022-08-30 19:48:24 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-08-30 19:48:24 +0100 |
| commit | 04c4c5746e15884768d2cb41370c3276a196cd4c (patch) | |
| tree | 1e629820796635bd332b2066c03d548fad527f89 /src/channel.c | |
| parent | f240395fca63d4b330112a4b81e94b05b50de1aa (diff) | |
patch 9.0.0335: checks for Dictionary argument often give a vague errorv9.0.0335
Problem: Checks for Dictionary argument often give a vague error message.
Solution: Give a useful error message. (Yegappan Lakshmanan, closes #11009)
Diffstat (limited to 'src/channel.c')
| -rw-r--r-- | src/channel.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/channel.c b/src/channel.c index 0bfeeac476..89776861d8 100644 --- a/src/channel.c +++ b/src/channel.c @@ -1392,11 +1392,8 @@ channel_open_func(typval_T *argvars) address = tv_get_string(&argvars[0]); if (argvars[1].v_type != VAR_UNKNOWN - && (argvars[1].v_type != VAR_DICT || argvars[1].vval.v_dict == NULL)) - { - emsg(_(e_invalid_argument)); + && check_for_nonnull_dict_arg(argvars, 1) == FAIL) return NULL; - } if (*address == NUL) { @@ -4601,11 +4598,9 @@ ch_expr_common(typval_T *argvars, typval_T *rettv, int eval) if (rettv_dict_alloc(rettv) == FAIL) return; - if (argvars[1].v_type != VAR_DICT) - { - semsg(_(e_dict_required_for_argument_nr), 2); + if (check_for_dict_arg(argvars, 1) == FAIL) return; - } + d = argvars[1].vval.v_dict; di = dict_find(d, (char_u *)"id", -1); if (di != NULL && di->di_tv.v_type != VAR_NUMBER) |