patch 9.0.1715: duplicate test in message_test.c

Problem: duplicate test in message_test.c
Solution: Remove duplicate test and make functions static

closes: #12803

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>

diff --git a/src/message_test.c b/src/message_test.c
index 4ad8041a4617e96b87fe3759fedc7ee49c16b44f..e5fd5623056c26005f07bd1df7c37353182c734f 100644 (file)
--- a/src/message_test.c
+++ b/src/message_test.c
@@ -402,11 +402,6 @@ test_vim_snprintf_positional(void)
        assert(bsize == 0 || STRNCMP(buf, "9 1234567 7654321", bsize_int) == 0);
        assert(bsize == 0 || buf[MIN(n, bsize_int)] == '\0');
 
-       n = vim_snprintf(buf, bsize, "%2$d %1$llu %3$lu", 1234567LLU, 9, 7654321UL);
-       assert(n == 17);
-       assert(bsize == 0 || STRNCMP(buf, "9 1234567 7654321", bsize_int) == 0);
-       assert(bsize == 0 || buf[MIN(n, bsize_int)] == '\0');
-
        n = vim_snprintf(buf, bsize, "%2$d %1$x %3$lu", 0xdeadbeef, 9, 7654321UL);
        assert(n == 18);
        assert(bsize == 0 || STRNCMP(buf, "9 deadbeef 7654321", bsize_int) == 0);

diff --git a/src/strings.c b/src/strings.c
index ead59164e49d02873e4813112ba894fe4bb248b2..e5ad9cda3f143ff151a1f43db273e4e63f833398 100644 (file)
--- a/src/strings.c
+++ b/src/strings.c
@@ -2260,7 +2260,7 @@ enum
 
 /* Types that can be used in a format string
  */
-    int
+    static int
 format_typeof(
     const char *type,
     int                usetvs UNUSED)
@@ -2386,7 +2386,7 @@ format_typeof(
     return TYPE_UNKNOWN;
 }
 
-    char *
+    static char *
 format_typename(
     const char  *type)
 {
@@ -2429,7 +2429,7 @@ format_typename(
     return _(typename_unknown);
 }
 
-    int
+    static int
 adjust_types(
     const char ***ap_types,
     int arg,
@@ -2490,7 +2490,7 @@ adjust_types(
     return OK;
 }
 
-    int
+    static int
 parse_fmt_types(
     const char  ***ap_types,
     int                *num_posarg,
@@ -2788,7 +2788,7 @@ error:
     return FAIL;
 }
 
-    void
+    static void
 skip_to_arg(
     const char **ap_types,
     va_list    ap_start,

diff --git a/src/version.c b/src/version.c
index fa45168039ac6cf74d647dad1235692a8a855138..c759da9c8b4b7053ad4fd87b03783f5a3c2d0dc8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1715,
 /**/
     1714,
 /**/