diff options
| author | Christ van Willegen <cvwillegen@gmail.com> | 2023-09-08 19:17:09 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-09-08 19:18:58 +0200 |
| commit | 1bd2cb11694690a77e4141bce2e34d9dfb882f1c (patch) | |
| tree | 3257557a432611cea7e47c7dd2051c702388760e | |
| parent | 4e554d282c50e428932df5fff9917f8a836f7782 (diff) | |
patch 9.0.1884: Wrong order of arguments for error messagesv9.0.1884
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 <cb@256bit.org>
Co-authored-by: Christ van Willegen <cvwillegen@gmail.com>
| -rw-r--r-- | src/errors.h | 4 | ||||
| -rw-r--r-- | src/strings.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/errors.h b/src/errors.h index e719ffde1a..fc40fe865f 100644 --- a/src/errors.h +++ b/src/errors.h @@ -3511,8 +3511,8 @@ EXTERN char e_member_str_type_mismatch_expected_str_but_got_str[] INIT(= N_("E1406: Member \"%s\": type mismatch, expected %s but got %s")); EXTERN char e_method_str_type_mismatch_expected_str_but_got_str[] INIT(= N_("E1407: Member \"%s\": type mismatch, expected %s but got %s")); -EXTERN char e_aptypes_is_null_str_nr[] - INIT(= "E1408: Internal error: ap_types or ap_types[idx] is NULL: %s: %d"); +EXTERN char e_aptypes_is_null_nr_str[] + INIT(= "E1408: Internal error: ap_types or ap_types[idx] is NULL: %d: %s"); EXTERN char e_interface_static_direct_access_str[] INIT(= N_("E1409: Cannot directly access interface \"%s\" static member \"%s\"")); // E1371 - E1399 unused diff --git a/src/strings.c b/src/strings.c index 710b1d35ce..33616d609b 100644 --- a/src/strings.c +++ b/src/strings.c @@ -2801,7 +2801,7 @@ skip_to_arg( if (ap_types == NULL || ap_types[*arg_cur] == NULL) { - siemsg(e_aptypes_is_null_str_nr, fmt, *arg_cur); + siemsg(e_aptypes_is_null_nr_str, *arg_cur, fmt); return; } diff --git a/src/version.c b/src/version.c index da48158d3d..9797b234e7 100644 --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1884, +/**/ 1883, /**/ 1882, |