# HG changeset patch # User Christian Brabandt # Date 1692133204 -7200 # Node ID f48e27f20e6ba5d6539612f21e54710d0ab75b00 # Parent d8aa1df4a3877583c9d50eee3da90a9b72e59640 patch 9.0.1715: duplicate test in message_test.c Commit: https://github.com/vim/vim/commit/7772c93a3ec1ce60469e9aea9899687ae1141f34 Author: zeertzjq Date: Tue Aug 15 22:48:40 2023 +0200 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 Co-authored-by: zeertzjq diff --git a/src/message_test.c b/src/message_test.c --- 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 --- 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 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1715, +/**/ 1714, /**/ 1713,