diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-01-02 20:20:45 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-01-02 20:20:45 +0000 |
commit | b09feaa86ecc53b9b953710082496951776dc5c6 (patch) | |
tree | 0baf02c96c94c26072e9afdb833e638c3ab1a9cb /src/json.c | |
parent | ac78dd4a352196ca4e6640f8e4caaf126afd49e3 (diff) |
patch 8.2.3986: error messages are spread outv8.2.3986
Problem: Error messages are spread out.
Solution: Move more error messages to errors.h.
Diffstat (limited to 'src/json.c')
-rw-r--r-- | src/json.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/json.c b/src/json.c index d3e05da4ad..c9bbac601b 100644 --- a/src/json.c +++ b/src/json.c @@ -20,8 +20,6 @@ static int json_encode_item(garray_T *gap, typval_T *val, int copyID, int options); -static char e_json_error[] = N_("E491: json decode error at '%s'"); - /* * Encode "val" into a JSON format string. * The result is added to "gap" @@ -740,7 +738,7 @@ json_decode_item(js_read_T *reader, typval_T *res, int options) retval = json_decode_string(reader, cur_item, *p); else { - semsg(_(e_json_error), p); + semsg(_(e_json_decode_error_at_str), p); retval = FAIL; } break; @@ -748,7 +746,7 @@ json_decode_item(js_read_T *reader, typval_T *res, int options) case ',': // comma: empty item if ((options & JSON_JS) == 0) { - semsg(_(e_json_error), p); + semsg(_(e_json_decode_error_at_str), p); retval = FAIL; break; } @@ -778,7 +776,7 @@ json_decode_item(js_read_T *reader, typval_T *res, int options) } if (!VIM_ISDIGIT(*sp)) { - semsg(_(e_json_error), p); + semsg(_(e_json_decode_error_at_str), p); retval = FAIL; break; } @@ -810,7 +808,7 @@ json_decode_item(js_read_T *reader, typval_T *res, int options) &nr, NULL, 0, TRUE); if (len == 0) { - semsg(_(e_json_error), p); + semsg(_(e_json_decode_error_at_str), p); retval = FAIL; goto theend; } @@ -971,7 +969,7 @@ item_end: retval = MAYBE; else { - semsg(_(e_json_error), p); + semsg(_(e_json_decode_error_at_str), p); retval = FAIL; } goto theend; @@ -989,7 +987,7 @@ item_end: retval = MAYBE; else { - semsg(_(e_json_error), p); + semsg(_(e_json_decode_error_at_str), p); retval = FAIL; } goto theend; @@ -1044,7 +1042,7 @@ item_end: retval = MAYBE; else { - semsg(_(e_json_error), p); + semsg(_(e_json_decode_error_at_str), p); retval = FAIL; } goto theend; @@ -1063,7 +1061,7 @@ item_end: res->v_type = VAR_SPECIAL; res->vval.v_number = VVAL_NONE; } - semsg(_(e_json_error), p); + semsg(_(e_json_decode_error_at_str), p); theend: for (i = 0; i < stack.ga_len; i++) @@ -1090,7 +1088,7 @@ json_decode_all(js_read_T *reader, typval_T *res, int options) if (ret != OK) { if (ret == MAYBE) - semsg(_(e_json_error), reader->js_buf); + semsg(_(e_json_decode_error_at_str), reader->js_buf); return FAIL; } json_skip_white(reader); |