diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-01-13 23:38:42 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-01-13 23:38:42 +0100 |
| commit | f9e3e09fdc93be9f0d47afbc6c7df1188c2a5a0d (patch) | |
| tree | a6b07005c19279a4f5d01be14f14861c2657fa95 /src/json.c | |
| parent | 05500ece6282407f9f7227aaf564e24147326863 (diff) | |
patch 8.1.0743: giving error messages is not flexiblev8.1.0743
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.
Diffstat (limited to 'src/json.c')
| -rw-r--r-- | src/json.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/json.c b/src/json.c index d8ccfe8fbe..11bb048327 100644 --- a/src/json.c +++ b/src/json.c @@ -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; |