aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.2.3986: error messages are spread out

Browse Source 
Problem:    Error messages are spread out.
Solution:   Move more error messages to errors.h.
This commit is contained in:
Bram Moolenaar
2022-01-02 20:20:45 +00:00
parent ac78dd4a35
commit b09feaa86e
18 changed files with 141 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/json.c
View File

@@ -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);