X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Funistdio%2Ftest-u32-vasnprintf3.c;h=38bcaa95670e158b1c5e55840c98923fffa87d50;hb=b8c5e24996c9626f03890cd986fc1fb7b17fa610;hp=8f55a45c505edb51825a17ec6b81b4551a25bd66;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git

diff --git a/tests/unistdio/test-u32-vasnprintf3.c b/tests/unistdio/test-u32-vasnprintf3.c
index 8f55a45c5..38bcaa956 100644
--- a/tests/unistdio/test-u32-vasnprintf3.c
+++ b/tests/unistdio/test-u32-vasnprintf3.c
@@ -1,5 +1,5 @@
 /* Test of u32_vasnprintf() function in an UTF-8 locale.
-   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
    it under the terms of the GNU General Public License as published by
@@ -22,24 +22,12 @@
 
 #include <locale.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do									     \
-    {									     \
-      if (!(expr))							     \
-        {								     \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          abort ();							     \
-        }								     \
-    }									     \
-  while (0)
+#include "macros.h"
 
 static void
 test_function (uint32_t * (*my_asnprintf) (uint32_t *, size_t *, const char *, ...))
@@ -51,9 +39,9 @@ test_function (uint32_t * (*my_asnprintf) (uint32_t *, size_t *, const char *, .
     {
       size_t length;
       uint32_t *result =
-	my_asnprintf (NULL, &length, "%s %d", locale_string, 33, 44, 55);
+        my_asnprintf (NULL, &length, "%s %d", locale_string, 33, 44, 55);
       static const uint32_t expected[] =
-	{ 0x00c4, 'r', 'g', 'e', 'r', ' ', '3', '3', 0 };
+        { 0x00c4, 'r', 'g', 'e', 'r', ' ', '3', '3', 0 };
       ASSERT (result != NULL);
       ASSERT (u32_strcmp (result, expected) == 0);
       ASSERT (length == u32_strlen (result));
@@ -62,11 +50,11 @@ test_function (uint32_t * (*my_asnprintf) (uint32_t *, size_t *, const char *, .
     { /* Width.  */
       size_t length;
       uint32_t *result =
-	my_asnprintf (NULL, &length, "%10s %d", locale_string, 33, 44, 55);
+        my_asnprintf (NULL, &length, "%10s %d", locale_string, 33, 44, 55);
       static const uint32_t expected[] =
-	{ ' ', ' ', ' ', ' ', ' ', 0x00c4, 'r', 'g', 'e', 'r',
-	  ' ', '3', '3', 0
-	};
+        { ' ', ' ', ' ', ' ', ' ', 0x00c4, 'r', 'g', 'e', 'r',
+          ' ', '3', '3', 0
+        };
       ASSERT (result != NULL);
       ASSERT (u32_strcmp (result, expected) == 0);
       ASSERT (length == u32_strlen (result));
@@ -75,11 +63,11 @@ test_function (uint32_t * (*my_asnprintf) (uint32_t *, size_t *, const char *, .
     { /* FLAG_LEFT.  */
       size_t length;
       uint32_t *result =
-	my_asnprintf (NULL, &length, "%-10s %d", locale_string, 33, 44, 55);
+        my_asnprintf (NULL, &length, "%-10s %d", locale_string, 33, 44, 55);
       static const uint32_t expected[] =
-	{ 0x00c4, 'r', 'g', 'e', 'r', ' ', ' ', ' ', ' ', ' ',
-	  ' ', '3', '3', 0
-	};
+        { 0x00c4, 'r', 'g', 'e', 'r', ' ', ' ', ' ', ' ', ' ',
+          ' ', '3', '3', 0
+        };
       ASSERT (result != NULL);
       ASSERT (u32_strcmp (result, expected) == 0);
       ASSERT (length == u32_strlen (result));
@@ -88,11 +76,11 @@ test_function (uint32_t * (*my_asnprintf) (uint32_t *, size_t *, const char *, .
     { /* FLAG_ZERO: no effect.  */
       size_t length;
       uint32_t *result =
-	my_asnprintf (NULL, &length, "%010s %d", locale_string, 33, 44, 55);
+        my_asnprintf (NULL, &length, "%010s %d", locale_string, 33, 44, 55);
       static const uint32_t expected[] =
-	{ ' ', ' ', ' ', ' ', ' ', 0x00c4, 'r', 'g', 'e', 'r',
-	  ' ', '3', '3', 0
-	};
+        { ' ', ' ', ' ', ' ', ' ', 0x00c4, 'r', 'g', 'e', 'r',
+          ' ', '3', '3', 0
+        };
       ASSERT (result != NULL);
       ASSERT (u32_strcmp (result, expected) == 0);
       ASSERT (length == u32_strlen (result));