thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0743: giving error messages is not flexible

Browse Source 
Problem:    Giving error messages is not flexible.
Solution:   Add semsg().  Change argument from "char_u *" to "char *", also
            for msg() and get rid of most MSG macros. (Ozaki Kiichi, closes
            #3302)  Also make emsg() accept a "char *" argument.  Get rid of
            an enormous number of type casts.
This commit is contained in:
Bram Moolenaar
2019-01-13 23:38:42 +01:00
parent 05500ece62
commit f9e3e09fdc
95 changed files with 1963 additions and 2018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/json.c
View File

@@ -232,7 +232,7 @@ json_encode_item(garray_T *gap, typval_T *val, int copyID, int options)
case VAR_JOB:
case VAR_CHANNEL:
/* no JSON equivalent TODO: better error */
EMSG(_(e_invarg));
emsg(_(e_invarg));
return FAIL;
case VAR_BLOB:
@@ -739,7 +739,7 @@ json_decode_item(js_read_T *reader, typval_T *res, int options)
retval = json_decode_string(reader, cur_item, *p);
else
{
EMSG(_(e_invarg));
emsg(_(e_invarg));
retval = FAIL;
}
break;
@@ -747,7 +747,7 @@ json_decode_item(js_read_T *reader, typval_T *res, int options)
case ',': /* comma: empty item */
if ((options & JSON_JS) == 0)
{
EMSG(_(e_invarg));
emsg(_(e_invarg));
retval = FAIL;
break;
}
@@ -777,7 +777,7 @@ json_decode_item(js_read_T *reader, typval_T *res, int options)
}
if (!VIM_ISDIGIT(*sp))
{
EMSG(_(e_invarg));
emsg(_(e_invarg));
retval = FAIL;
break;
}
@@ -915,7 +915,7 @@ json_decode_item(js_read_T *reader, typval_T *res, int options)
if (top_item->jd_key == NULL)
{
clear_tv(cur_item);
EMSG(_(e_invarg));
emsg(_(e_invarg));
retval = FAIL;
goto theend;
}
@@ -953,7 +953,7 @@ item_end:
retval = MAYBE;
else
{
EMSG(_(e_invarg));
emsg(_(e_invarg));
retval = FAIL;
}
goto theend;
@@ -971,7 +971,7 @@ item_end:
retval = MAYBE;
else
{
EMSG(_(e_invarg));
emsg(_(e_invarg));
retval = FAIL;
}
goto theend;
@@ -988,7 +988,7 @@ item_end:
&& dict_find(top_item->jd_tv.vval.v_dict,
top_item->jd_key, -1) != NULL)
{
EMSG2(_("E938: Duplicate key in JSON: \"%s\""),
semsg(_("E938: Duplicate key in JSON: \"%s\""),
top_item->jd_key);
clear_tv(&top_item->jd_key_tv);
clear_tv(cur_item);
@@ -1027,7 +1027,7 @@ item_end:
retval = MAYBE;
else
{
EMSG(_(e_invarg));
emsg(_(e_invarg));
retval = FAIL;
}
goto theend;
@@ -1046,7 +1046,7 @@ item_end:
res->v_type = VAR_SPECIAL;
res->vval.v_number = VVAL_NONE;
}
EMSG(_(e_invarg));
emsg(_(e_invarg));
theend:
ga_clear(&stack);
@@ -1070,13 +1070,13 @@ json_decode_all(js_read_T *reader, typval_T *res, int options)
if (ret != OK)
{
if (ret == MAYBE)
EMSG(_(e_invarg));
emsg(_(e_invarg));
return FAIL;
}
json_skip_white(reader);
if (reader->js_buf[reader->js_used] != NUL)
{
EMSG(_(e_trailing));
emsg(_(e_trailing));
return FAIL;
}
return OK;