X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-xvasprintf.c;h=df6c2009de63c5571a18bc96ecb133c66bde1fde;hb=41d7de2bc881ddb3ce8a8a40552724ebb893108a;hp=229e3fd18fe260ac093708124a35da847e1bbd87;hpb=eeb7039f209f06a460dc50b41956d7a07e2d2a32;p=gnulib.git

diff --git a/tests/test-xvasprintf.c b/tests/test-xvasprintf.c
index 229e3fd18..df6c2009d 100644
--- a/tests/test-xvasprintf.c
+++ b/tests/test-xvasprintf.c
@@ -1,5 +1,5 @@
 /* Test of xvasprintf() and xasprintf() functions.
-   Copyright (C) 2007-2009 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 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
@@ -21,23 +21,11 @@
 #include "xvasprintf.h"
 
 #include <stdarg.h>
-#include <stdio.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, ...)
@@ -65,10 +53,14 @@ test_xvasprintf (void)
       free (result);
     }
 
-  result = my_xasprintf ("");
-  ASSERT (result != NULL);
-  ASSERT (strcmp (result, "") == 0);
-  free (result);
+  {
+    /* Silence gcc warning about zero-length format string.  */
+    char *empty = "";
+    result = my_xasprintf (empty);
+    ASSERT (result != NULL);
+    ASSERT (strcmp (result, "") == 0);
+    free (result);
+  }
 
   result = my_xasprintf ("%s", "foo");
   ASSERT (result != NULL);
@@ -100,10 +92,14 @@ test_xasprintf ()
       free (result);
     }
 
-  result = xasprintf ("");
-  ASSERT (result != NULL);
-  ASSERT (strcmp (result, "") == 0);
-  free (result);
+  {
+    /* Silence gcc warning about zero-length format string.  */
+    char *empty = "";
+    result = xasprintf (empty);
+    ASSERT (result != NULL);
+    ASSERT (strcmp (result, "") == 0);
+    free (result);
+  }
 
   result = xasprintf ("%s", "foo");
   ASSERT (result != NULL);
@@ -122,7 +118,7 @@ test_xasprintf ()
 }
 
 int
-main (int argc _UNUSED_PARAMETER_, char *argv[])
+main (int argc _GL_UNUSED, char *argv[])
 {
   set_program_name (argv[0]);