PVS/V618: fix printf-style args #11888

We intentionally do not translate API errors. 
ref: https://github.com/neovim/neovim/issues/6150
This commit is contained in:
Justin M. Keyes
2020-02-22 12:59:39 -08:00
committed by GitHub
parent ff1730373c
commit 93c6eb4a66
4 changed files with 12 additions and 12 deletions

View File

@@ -1123,7 +1123,7 @@ ArrayOf(Integer) nvim_buf_get_extmark_by_id(Buffer buffer, Integer ns_id,
} }
if (!ns_initialized((uint64_t)ns_id)) { if (!ns_initialized((uint64_t)ns_id)) {
api_set_error(err, kErrorTypeValidation, _("Invalid ns_id")); api_set_error(err, kErrorTypeValidation, "Invalid ns_id");
return rv; return rv;
} }
@@ -1190,7 +1190,7 @@ Array nvim_buf_get_extmarks(Buffer buffer, Integer ns_id, Object start,
} }
if (!ns_initialized((uint64_t)ns_id)) { if (!ns_initialized((uint64_t)ns_id)) {
api_set_error(err, kErrorTypeValidation, _("Invalid ns_id")); api_set_error(err, kErrorTypeValidation, "Invalid ns_id");
return rv; return rv;
} }
Integer limit = -1; Integer limit = -1;
@@ -1280,7 +1280,7 @@ Integer nvim_buf_set_extmark(Buffer buffer, Integer ns_id, Integer id,
} }
if (!ns_initialized((uint64_t)ns_id)) { if (!ns_initialized((uint64_t)ns_id)) {
api_set_error(err, kErrorTypeValidation, _("Invalid ns_id")); api_set_error(err, kErrorTypeValidation, "Invalid ns_id");
return 0; return 0;
} }
@@ -1308,7 +1308,7 @@ Integer nvim_buf_set_extmark(Buffer buffer, Integer ns_id, Integer id,
if (id >= 0) { if (id >= 0) {
id_num = (uint64_t)id; id_num = (uint64_t)id;
} else { } else {
api_set_error(err, kErrorTypeValidation, _("Invalid mark id")); api_set_error(err, kErrorTypeValidation, "Invalid mark id");
return 0; return 0;
} }
@@ -1337,7 +1337,7 @@ Boolean nvim_buf_del_extmark(Buffer buffer,
return false; return false;
} }
if (!ns_initialized((uint64_t)ns_id)) { if (!ns_initialized((uint64_t)ns_id)) {
api_set_error(err, kErrorTypeValidation, _("Invalid ns_id")); api_set_error(err, kErrorTypeValidation, "Invalid ns_id");
return false; return false;
} }
@@ -1655,7 +1655,7 @@ Integer nvim__buf_add_decoration(Buffer buffer, Integer ns_id, String hl_group,
} }
if (!ns_initialized((uint64_t)ns_id)) { if (!ns_initialized((uint64_t)ns_id)) {
api_set_error(err, kErrorTypeValidation, _("Invalid ns_id")); api_set_error(err, kErrorTypeValidation, "Invalid ns_id");
return 0; return 0;
} }

View File

@@ -1544,7 +1544,7 @@ bool extmark_get_index_from_obj(buf_T *buf, Integer ns_id, Object obj, int
*col = MAXCOL; *col = MAXCOL;
return true; return true;
} else if (id < 0) { } else if (id < 0) {
api_set_error(err, kErrorTypeValidation, _("Mark id must be positive")); api_set_error(err, kErrorTypeValidation, "Mark id must be positive");
return false; return false;
} }
@@ -1554,7 +1554,7 @@ bool extmark_get_index_from_obj(buf_T *buf, Integer ns_id, Object obj, int
*col = extmark.col; *col = extmark.col;
return true; return true;
} else { } else {
api_set_error(err, kErrorTypeValidation, _("No mark with requested id")); api_set_error(err, kErrorTypeValidation, "No mark with requested id");
return false; return false;
} }
@@ -1565,7 +1565,7 @@ bool extmark_get_index_from_obj(buf_T *buf, Integer ns_id, Object obj, int
|| pos.items[0].type != kObjectTypeInteger || pos.items[0].type != kObjectTypeInteger
|| pos.items[1].type != kObjectTypeInteger) { || pos.items[1].type != kObjectTypeInteger) {
api_set_error(err, kErrorTypeValidation, api_set_error(err, kErrorTypeValidation,
_("Position must have 2 integer elements")); "Position must have 2 integer elements");
return false; return false;
} }
Integer pos_row = pos.items[0].data.integer; Integer pos_row = pos.items[0].data.integer;
@@ -1575,7 +1575,7 @@ bool extmark_get_index_from_obj(buf_T *buf, Integer ns_id, Object obj, int
return true; return true;
} else { } else {
api_set_error(err, kErrorTypeValidation, api_set_error(err, kErrorTypeValidation,
_("Position must be a mark id Integer or position Array")); "Position must be a mark id Integer or position Array");
return false; return false;
} }
} }

View File

@@ -4083,7 +4083,7 @@ static int ins_compl_get_exp(pos_T *ini)
type = CTRL_X_PATH_DEFINES; type = CTRL_X_PATH_DEFINES;
else if (*e_cpt == ']' || *e_cpt == 't') { else if (*e_cpt == ']' || *e_cpt == 't') {
type = CTRL_X_TAGS; type = CTRL_X_TAGS;
vim_snprintf((char *)IObuff, IOSIZE, _("Scanning tags.")); vim_snprintf((char *)IObuff, IOSIZE, "%s", _("Scanning tags."));
(void)msg_trunc_attr(IObuff, true, HL_ATTR(HLF_R)); (void)msg_trunc_attr(IObuff, true, HL_ATTR(HLF_R));
} else { } else {
type = -1; type = -1;

View File

@@ -2701,7 +2701,7 @@ static bool color_cmdline(CmdlineInfo *colored_ccline)
goto color_cmdline_error; goto color_cmdline_error;
} }
if (tv.v_type != VAR_LIST) { if (tv.v_type != VAR_LIST) {
PRINT_ERRMSG(_("E5400: Callback should return list")); PRINT_ERRMSG("%s", _("E5400: Callback should return list"));
goto color_cmdline_error; goto color_cmdline_error;
} }
if (tv.vval.v_list == NULL) { if (tv.vval.v_list == NULL) {