Skip to content

Commit 1bd2cb1

Browse files
cvwillegenchrisbra
authored andcommitted
patch 9.0.1884: Wrong order of arguments for error messages
Problem: Wrong order of arguments for error messages Solution: Reverse order or arguments for e_aptypes_is_null_nr_str closes: #13051 Signed-off-by: Christian Brabandt <[email protected]> Co-authored-by: Christ van Willegen <[email protected]>
1 parent 4e554d2 commit 1bd2cb1

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

src/errors.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3511,8 +3511,8 @@ EXTERN char e_member_str_type_mismatch_expected_str_but_got_str[]
35113511
INIT(= N_("E1406: Member \"%s\": type mismatch, expected %s but got %s"));
35123512
EXTERN char e_method_str_type_mismatch_expected_str_but_got_str[]
35133513
INIT(= N_("E1407: Member \"%s\": type mismatch, expected %s but got %s"));
3514-
EXTERN char e_aptypes_is_null_str_nr[]
3515-
INIT(= "E1408: Internal error: ap_types or ap_types[idx] is NULL: %s: %d");
3514+
EXTERN char e_aptypes_is_null_nr_str[]
3515+
INIT(= "E1408: Internal error: ap_types or ap_types[idx] is NULL: %d: %s");
35163516
EXTERN char e_interface_static_direct_access_str[]
35173517
INIT(= N_("E1409: Cannot directly access interface \"%s\" static member \"%s\""));
35183518
// E1371 - E1399 unused

src/strings.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2801,7 +2801,7 @@ skip_to_arg(
28012801

28022802
if (ap_types == NULL || ap_types[*arg_cur] == NULL)
28032803
{
2804-
siemsg(e_aptypes_is_null_str_nr, fmt, *arg_cur);
2804+
siemsg(e_aptypes_is_null_nr_str, *arg_cur, fmt);
28052805
return;
28062806
}
28072807

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,8 @@ static char *(features[]) =
699699

700700
static int included_patches[] =
701701
{ /* Add new patch number below this line */
702+
/**/
703+
1884,
702704
/**/
703705
1883,
704706
/**/

0 commit comments

Comments
 (0)