projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
maint: update copyright
[gnulib.git]
/
tests
/
test-xvasprintf.c
diff --git
a/tests/test-xvasprintf.c
b/tests/test-xvasprintf.c
index
eb230db
..
45da3e4
100644
(file)
--- a/
tests/test-xvasprintf.c
+++ b/
tests/test-xvasprintf.c
@@
-1,5
+1,5
@@
/* Test of xvasprintf() and xasprintf() functions.
/* Test of xvasprintf() and xasprintf() functions.
- Copyright (C) 2007-20
09
Free Software Foundation, Inc.
+ Copyright (C) 2007-20
14
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-16,28
+16,23
@@
/* Written by Bruno Haible <bruno@clisp.org>, 2007. */
/* Written by Bruno Haible <bruno@clisp.org>, 2007. */
+/* Tell GCC not to warn about the specific edge cases tested here. */
+#if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__
+# pragma GCC diagnostic ignored "-Wformat-zero-length"
+# pragma GCC diagnostic ignored "-Wformat-nonliteral"
+# pragma GCC diagnostic ignored "-Wformat-security"
+#endif
+
#include <config.h>
#include "xvasprintf.h"
#include <stdarg.h>
#include <config.h>
#include "xvasprintf.h"
#include <stdarg.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "progname.h"
#include <stdlib.h>
#include <string.h>
#include "progname.h"
-
-#define ASSERT(expr) \
- do \
- { \
- if (!(expr)) \
- { \
- fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
- fflush (stderr); \
- abort (); \
- } \
- } \
- while (0)
+#include "macros.h"
static char *
my_xasprintf (const char *format, ...)
static char *
my_xasprintf (const char *format, ...)
@@
-67,7
+62,7
@@
test_xvasprintf (void)
{
/* Silence gcc warning about zero-length format string. */
{
/* Silence gcc warning about zero-length format string. */
- char *empty = "";
+ c
onst c
har *empty = "";
result = my_xasprintf (empty);
ASSERT (result != NULL);
ASSERT (strcmp (result, "") == 0);
result = my_xasprintf (empty);
ASSERT (result != NULL);
ASSERT (strcmp (result, "") == 0);
@@
-91,7
+86,7
@@
test_xvasprintf (void)
}
static void
}
static void
-test_xasprintf ()
+test_xasprintf (
void
)
{
int repeat;
char *result;
{
int repeat;
char *result;
@@
-105,9
+100,11
@@
test_xasprintf ()
}
{
}
{
- /* Silence gcc warning about zero-length format string. */
- char *empty = "";
- result = xasprintf (empty);
+ /* Silence gcc warning about zero-length format string,
+ and about "format not a string literal and no format"
+ (whatever that means) . */
+ const char *empty = "";
+ result = xasprintf (empty, empty);
ASSERT (result != NULL);
ASSERT (strcmp (result, "") == 0);
free (result);
ASSERT (result != NULL);
ASSERT (strcmp (result, "") == 0);
free (result);