projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strtod: Restore errno when successfully parsing Infinity or NaN.
[gnulib.git]
/
tests
/
unistdio
/
test-ulc-vasnprintf3.c
diff --git
a/tests/unistdio/test-ulc-vasnprintf3.c
b/tests/unistdio/test-ulc-vasnprintf3.c
index
3072cec
..
b3b8414
100644
(file)
--- a/
tests/unistdio/test-ulc-vasnprintf3.c
+++ b/
tests/unistdio/test-ulc-vasnprintf3.c
@@
-1,10
+1,10
@@
/* Test of ulc_vasnprintf() function in an UTF-8 locale.
/* Test of ulc_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
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
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
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. */
/* Written by Bruno Haible <bruno@clisp.org>, 2007. */
@@
-23,22
+22,11
@@
#include <locale.h>
#include <stdarg.h>
#include <locale.h>
#include <stdarg.h>
-#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.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 (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
static void
test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
@@
-50,7
+38,7
@@
test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
{
size_t length;
char *result =
{
size_t length;
char *result =
- my_asnprintf (NULL, &length, "%U %d", unicode_string, 33, 44, 55);
+
my_asnprintf (NULL, &length, "%U %d", unicode_string, 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, "Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
ASSERT (result != NULL);
ASSERT (strcmp (result, "Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
@@
-59,7
+47,7
@@
test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
{ /* Width. */
size_t length;
char *result =
{ /* Width. */
size_t length;
char *result =
- my_asnprintf (NULL, &length, "%20U %d", unicode_string, 33, 44, 55);
+
my_asnprintf (NULL, &length, "%20U %d", unicode_string, 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, " Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
ASSERT (result != NULL);
ASSERT (strcmp (result, " Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
@@
-68,7
+56,7
@@
test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
{ /* FLAG_LEFT. */
size_t length;
char *result =
{ /* FLAG_LEFT. */
size_t length;
char *result =
- my_asnprintf (NULL, &length, "%-20U %d", unicode_string, 33, 44, 55);
+
my_asnprintf (NULL, &length, "%-20U %d", unicode_string, 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, "Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
ASSERT (result != NULL);
ASSERT (strcmp (result, "Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
@@
-77,7
+65,7
@@
test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
{ /* FLAG_ZERO: no effect. */
size_t length;
char *result =
{ /* FLAG_ZERO: no effect. */
size_t length;
char *result =
- my_asnprintf (NULL, &length, "%020U %d", unicode_string, 33, 44, 55);
+
my_asnprintf (NULL, &length, "%020U %d", unicode_string, 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, " Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
ASSERT (result != NULL);
ASSERT (strcmp (result, " Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
@@
-88,13
+76,13
@@
test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
{
static const uint16_t unicode_string[] = /* Rafał Maszkowski */
{
{
static const uint16_t unicode_string[] = /* Rafał Maszkowski */
{
- 'R', 'a', 'f', 'a', 0x0142, ' ', 'M', 'a', 's', 'z', 'k', 'o', 'w',
- 's', 'k', 'i', 0
+
'R', 'a', 'f', 'a', 0x0142, ' ', 'M', 'a', 's', 'z', 'k', 'o', 'w',
+
's', 'k', 'i', 0
};
{
size_t length;
char *result =
};
{
size_t length;
char *result =
- my_asnprintf (NULL, &length, "%lU %d", unicode_string, 33, 44, 55);
+
my_asnprintf (NULL, &length, "%lU %d", unicode_string, 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, "Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
ASSERT (result != NULL);
ASSERT (strcmp (result, "Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
@@
-103,7
+91,7
@@
test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
{ /* Width. */
size_t length;
char *result =
{ /* Width. */
size_t length;
char *result =
- my_asnprintf (NULL, &length, "%20lU %d", unicode_string, 33, 44, 55);
+
my_asnprintf (NULL, &length, "%20lU %d", unicode_string, 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, " Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
ASSERT (result != NULL);
ASSERT (strcmp (result, " Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
@@
-112,7
+100,7
@@
test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
{ /* FLAG_LEFT. */
size_t length;
char *result =
{ /* FLAG_LEFT. */
size_t length;
char *result =
- my_asnprintf (NULL, &length, "%-20lU %d", unicode_string, 33, 44, 55);
+
my_asnprintf (NULL, &length, "%-20lU %d", unicode_string, 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, "Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
ASSERT (result != NULL);
ASSERT (strcmp (result, "Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
@@
-121,7
+109,7
@@
test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
{ /* FLAG_ZERO: no effect. */
size_t length;
char *result =
{ /* FLAG_ZERO: no effect. */
size_t length;
char *result =
- my_asnprintf (NULL, &length, "%020lU %d", unicode_string, 33, 44, 55);
+
my_asnprintf (NULL, &length, "%020lU %d", unicode_string, 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, " Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
ASSERT (result != NULL);
ASSERT (strcmp (result, " Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
@@
-132,13
+120,13
@@
test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
{
static const uint32_t unicode_string[] = /* Rafał Maszkowski */
{
{
static const uint32_t unicode_string[] = /* Rafał Maszkowski */
{
- 'R', 'a', 'f', 'a', 0x0142, ' ', 'M', 'a', 's', 'z', 'k', 'o', 'w',
- 's', 'k', 'i', 0
+
'R', 'a', 'f', 'a', 0x0142, ' ', 'M', 'a', 's', 'z', 'k', 'o', 'w',
+
's', 'k', 'i', 0
};
{
size_t length;
char *result =
};
{
size_t length;
char *result =
- my_asnprintf (NULL, &length, "%llU %d", unicode_string, 33, 44, 55);
+
my_asnprintf (NULL, &length, "%llU %d", unicode_string, 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, "Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
ASSERT (result != NULL);
ASSERT (strcmp (result, "Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
@@
-147,7
+135,7
@@
test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
{ /* Width. */
size_t length;
char *result =
{ /* Width. */
size_t length;
char *result =
- my_asnprintf (NULL, &length, "%20llU %d", unicode_string, 33, 44, 55);
+
my_asnprintf (NULL, &length, "%20llU %d", unicode_string, 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, " Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
ASSERT (result != NULL);
ASSERT (strcmp (result, " Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
@@
-156,7
+144,7
@@
test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
{ /* FLAG_LEFT. */
size_t length;
char *result =
{ /* FLAG_LEFT. */
size_t length;
char *result =
- my_asnprintf (NULL, &length, "%-20llU %d", unicode_string, 33, 44, 55);
+
my_asnprintf (NULL, &length, "%-20llU %d", unicode_string, 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, "Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
ASSERT (result != NULL);
ASSERT (strcmp (result, "Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
@@
-165,7
+153,7
@@
test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
{ /* FLAG_ZERO: no effect. */
size_t length;
char *result =
{ /* FLAG_ZERO: no effect. */
size_t length;
char *result =
- my_asnprintf (NULL, &length, "%020llU %d", unicode_string, 33, 44, 55);
+
my_asnprintf (NULL, &length, "%020llU %d", unicode_string, 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, " Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
ASSERT (result != NULL);
ASSERT (strcmp (result, " Rafa\305\202 Maszkowski 33") == 0);
ASSERT (length == strlen (result));
@@
-180,7
+168,7
@@
test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
{
size_t length;
char *result =
{
size_t length;
char *result =
- my_asnprintf (NULL, &length, "%s %d", locale_string, 33, 44, 55);
+
my_asnprintf (NULL, &length, "%s %d", locale_string, 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, "\303\204rger 33") == 0);
ASSERT (length == strlen (result));
ASSERT (result != NULL);
ASSERT (strcmp (result, "\303\204rger 33") == 0);
ASSERT (length == strlen (result));
@@
-189,7
+177,7
@@
test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
{ /* Width. */
size_t length;
char *result =
{ /* Width. */
size_t length;
char *result =
- my_asnprintf (NULL, &length, "%10s %d", locale_string, 33, 44, 55);
+
my_asnprintf (NULL, &length, "%10s %d", locale_string, 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, " \303\204rger 33") == 0);
ASSERT (length == strlen (result));
ASSERT (result != NULL);
ASSERT (strcmp (result, " \303\204rger 33") == 0);
ASSERT (length == strlen (result));
@@
-198,7
+186,7
@@
test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
{ /* FLAG_LEFT. */
size_t length;
char *result =
{ /* FLAG_LEFT. */
size_t length;
char *result =
- my_asnprintf (NULL, &length, "%-10s %d", locale_string, 33, 44, 55);
+
my_asnprintf (NULL, &length, "%-10s %d", locale_string, 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, "\303\204rger 33") == 0);
ASSERT (length == strlen (result));
ASSERT (result != NULL);
ASSERT (strcmp (result, "\303\204rger 33") == 0);
ASSERT (length == strlen (result));
@@
-207,7
+195,7
@@
test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
{ /* FLAG_ZERO: no effect. */
size_t length;
char *result =
{ /* FLAG_ZERO: no effect. */
size_t length;
char *result =
- my_asnprintf (NULL, &length, "%010s %d", locale_string, 33, 44, 55);
+
my_asnprintf (NULL, &length, "%010s %d", locale_string, 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, " \303\204rger 33") == 0);
ASSERT (length == strlen (result));
ASSERT (result != NULL);
ASSERT (strcmp (result, " \303\204rger 33") == 0);
ASSERT (length == strlen (result));