1
0
forked from aniani/vim

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>
This commit is contained in:
zeertzjq 2023-08-15 22:48:40 +02:00 committed by Christian Brabandt
parent e4c79d3615
commit 7772c93a3e
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
3 changed files with 7 additions and 10 deletions

View File

@ -402,11 +402,6 @@ test_vim_snprintf_positional(void)
assert(bsize == 0 || STRNCMP(buf, "9 1234567 7654321", bsize_int) == 0); assert(bsize == 0 || STRNCMP(buf, "9 1234567 7654321", bsize_int) == 0);
assert(bsize == 0 || buf[MIN(n, 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); n = vim_snprintf(buf, bsize, "%2$d %1$x %3$lu", 0xdeadbeef, 9, 7654321UL);
assert(n == 18); assert(n == 18);
assert(bsize == 0 || STRNCMP(buf, "9 deadbeef 7654321", bsize_int) == 0); assert(bsize == 0 || STRNCMP(buf, "9 deadbeef 7654321", bsize_int) == 0);

View File

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

View File

@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1715,
/**/ /**/
1714, 1714,
/**/ /**/