X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-xvasprintf.c;h=234ec8373f20091f07ecc9e95d1ef1b0131078b1;hb=217fb89cd467efe0ae1668ac1b69d5cc4742e79b;hp=9d0dab31b248d0a718d68899cfa43565629cadd0;hpb=c9f0732d2e84d603e7e88df3222505ab8a80005c;p=gnulib.git

diff --git a/tests/test-xvasprintf.c b/tests/test-xvasprintf.c
index 9d0dab31b..234ec8373 100644
--- a/tests/test-xvasprintf.c
+++ b/tests/test-xvasprintf.c
@@ -1,10 +1,10 @@
 /* Test of xvasprintf() and xasprintf() functions.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,24 +12,32 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "xvasprintf.h"
 
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "progname.h"
 
-#define ASSERT(expr) if (!(expr)) abort ();
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          fflush (stderr);						     \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
 
 static char *
 my_xasprintf (const char *format, ...)
@@ -46,7 +54,6 @@ my_xasprintf (const char *format, ...)
 static void
 test_xvasprintf ()
 {
-  char buf[8];
   int repeat;
 
   for (repeat = 0; repeat <= 8; repeat++)
@@ -61,7 +68,6 @@ test_xvasprintf ()
 static void
 test_xasprintf ()
 {
-  char buf[8];
   int repeat;
 
   for (repeat = 0; repeat <= 8; repeat++)