X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Funistdio%2Ftest-u16-vasnprintf3.c;h=765d202bded5c81b5dd15b4bf82ca1ed5c440ee8;hb=88418d5fd24c99aac393d3e2f564f6939e4e2fe3;hp=0d6ab7490bf1984d1f7497b97c13d93746272ae5;hpb=2625ca90abe3246f6d3240d59d32f1843afc9651;p=gnulib.git
diff --git a/tests/unistdio/test-u16-vasnprintf3.c b/tests/unistdio/test-u16-vasnprintf3.c
index 0d6ab7490..765d202bd 100644
--- a/tests/unistdio/test-u16-vasnprintf3.c
+++ b/tests/unistdio/test-u16-vasnprintf3.c
@@ -1,10 +1,10 @@
/* Test of u16_vasnprintf() function in an UTF-8 locale.
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007-2011 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 . */
/* Written by Bruno Haible , 2007. */
@@ -23,24 +22,12 @@
#include
#include
-#include
#include
#include
#include
#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 (uint16_t * (*my_asnprintf) (uint16_t *, size_t *, const char *, ...))
@@ -52,9 +39,9 @@ test_function (uint16_t * (*my_asnprintf) (uint16_t *, size_t *, const char *, .
{
size_t length;
uint16_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 uint16_t expected[] =
- { 0x00c4, 'r', 'g', 'e', 'r', ' ', '3', '3', 0 };
+ { 0x00c4, 'r', 'g', 'e', 'r', ' ', '3', '3', 0 };
ASSERT (result != NULL);
ASSERT (u16_strcmp (result, expected) == 0);
ASSERT (length == u16_strlen (result));
@@ -63,11 +50,11 @@ test_function (uint16_t * (*my_asnprintf) (uint16_t *, size_t *, const char *, .
{ /* Width. */
size_t length;
uint16_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 uint16_t expected[] =
- { ' ', ' ', ' ', ' ', ' ', 0x00c4, 'r', 'g', 'e', 'r',
- ' ', '3', '3', 0
- };
+ { ' ', ' ', ' ', ' ', ' ', 0x00c4, 'r', 'g', 'e', 'r',
+ ' ', '3', '3', 0
+ };
ASSERT (result != NULL);
ASSERT (u16_strcmp (result, expected) == 0);
ASSERT (length == u16_strlen (result));
@@ -76,11 +63,11 @@ test_function (uint16_t * (*my_asnprintf) (uint16_t *, size_t *, const char *, .
{ /* FLAG_LEFT. */
size_t length;
uint16_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 uint16_t expected[] =
- { 0x00c4, 'r', 'g', 'e', 'r', ' ', ' ', ' ', ' ', ' ',
- ' ', '3', '3', 0
- };
+ { 0x00c4, 'r', 'g', 'e', 'r', ' ', ' ', ' ', ' ', ' ',
+ ' ', '3', '3', 0
+ };
ASSERT (result != NULL);
ASSERT (u16_strcmp (result, expected) == 0);
ASSERT (length == u16_strlen (result));
@@ -89,11 +76,11 @@ test_function (uint16_t * (*my_asnprintf) (uint16_t *, size_t *, const char *, .
{ /* FLAG_ZERO: no effect. */
size_t length;
uint16_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 uint16_t expected[] =
- { ' ', ' ', ' ', ' ', ' ', 0x00c4, 'r', 'g', 'e', 'r',
- ' ', '3', '3', 0
- };
+ { ' ', ' ', ' ', ' ', ' ', 0x00c4, 'r', 'g', 'e', 'r',
+ ' ', '3', '3', 0
+ };
ASSERT (result != NULL);
ASSERT (u16_strcmp (result, expected) == 0);
ASSERT (length == u16_strlen (result));