X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=tests%2Ftest-vasnprintf-posix2.c;h=04e2199d19c4161da530018c8ba26c814c11127e;hb=5dedf26dd50d9acd31d51cf068fdcf824e6bf25b;hp=65f3c6cfab5fc216f2c2bf78641c93770d2d147a;hpb=c0fea97ccf33a4e6b6f9116216b1634663f29474;p=gnulib.git

diff --git a/tests/test-vasnprintf-posix2.c b/tests/test-vasnprintf-posix2.c
index 65f3c6cfa..04e2199d1 100644
--- a/tests/test-vasnprintf-posix2.c
+++ b/tests/test-vasnprintf-posix2.c
@@ -1,10 +1,10 @@
 /* Test of POSIX compatible vasnprintf() and asnprintf() functions.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2012 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,8 +12,7 @@
    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.  */
 
@@ -22,20 +21,10 @@
 #include "vasnprintf.h"
 
 #include <locale.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do									     \
-    {									     \
-      if (!(expr))							     \
-        {								     \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          abort ();							     \
-        }								     \
-    }									     \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
@@ -50,9 +39,9 @@ main (int argc, char *argv[])
     char *result = asnprintf (NULL, &length, "%.1a", 1.0);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "0x1,0p+0") == 0
-	    || strcmp (result, "0x2,0p-1") == 0
-	    || strcmp (result, "0x4,0p-2") == 0
-	    || strcmp (result, "0x8,0p-3") == 0);
+            || strcmp (result, "0x2,0p-1") == 0
+            || strcmp (result, "0x4,0p-2") == 0
+            || strcmp (result, "0x8,0p-3") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -63,9 +52,9 @@ main (int argc, char *argv[])
     char *result = asnprintf (NULL, &length, "%.1La", 1.0L);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "0x1,0p+0") == 0
-	    || strcmp (result, "0x2,0p-1") == 0
-	    || strcmp (result, "0x4,0p-2") == 0
-	    || strcmp (result, "0x8,0p-3") == 0);
+            || strcmp (result, "0x2,0p-1") == 0
+            || strcmp (result, "0x4,0p-2") == 0
+            || strcmp (result, "0x8,0p-3") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }