projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
autoupdate
[gnulib.git]
/
tests
/
unistdio
/
test-u8-vasnprintf2.c
diff --git
a/tests/unistdio/test-u8-vasnprintf2.c
b/tests/unistdio/test-u8-vasnprintf2.c
index
f7f8f8a
..
8630207
100644
(file)
--- a/
tests/unistdio/test-u8-vasnprintf2.c
+++ b/
tests/unistdio/test-u8-vasnprintf2.c
@@
-1,5
+1,5
@@
/* Test of u8_vasnprintf() function in an ISO-8859-1 locale.
/* Test of u8_vasnprintf() function in an ISO-8859-1 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
it under the terms of the GNU General Public License as published by
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 <locale.h>
#include <stdarg.h>
-#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include "unistr.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 (uint8_t * (*my_asnprintf) (uint8_t *, size_t *, const char *, ...))
static void
test_function (uint8_t * (*my_asnprintf) (uint8_t *, size_t *, const char *, ...))
@@
-51,7
+39,7
@@
test_function (uint8_t * (*my_asnprintf) (uint8_t *, size_t *, const char *, ...
{
size_t length;
uint8_t *result =
{
size_t length;
uint8_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 uint8_t expected[] = "\303\204rger 33";
ASSERT (result != NULL);
ASSERT (u8_strcmp (result, expected) == 0);
static const uint8_t expected[] = "\303\204rger 33";
ASSERT (result != NULL);
ASSERT (u8_strcmp (result, expected) == 0);
@@
-61,7
+49,7
@@
test_function (uint8_t * (*my_asnprintf) (uint8_t *, size_t *, const char *, ...
{ /* Width. */
size_t length;
uint8_t *result =
{ /* Width. */
size_t length;
uint8_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 uint8_t expected[] = " \303\204rger 33";
ASSERT (result != NULL);
ASSERT (u8_strcmp (result, expected) == 0);
static const uint8_t expected[] = " \303\204rger 33";
ASSERT (result != NULL);
ASSERT (u8_strcmp (result, expected) == 0);
@@
-71,7
+59,7
@@
test_function (uint8_t * (*my_asnprintf) (uint8_t *, size_t *, const char *, ...
{ /* FLAG_LEFT. */
size_t length;
uint8_t *result =
{ /* FLAG_LEFT. */
size_t length;
uint8_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 uint8_t expected[] = "\303\204rger 33";
ASSERT (result != NULL);
ASSERT (u8_strcmp (result, expected) == 0);
static const uint8_t expected[] = "\303\204rger 33";
ASSERT (result != NULL);
ASSERT (u8_strcmp (result, expected) == 0);
@@
-81,7
+69,7
@@
test_function (uint8_t * (*my_asnprintf) (uint8_t *, size_t *, const char *, ...
{ /* FLAG_ZERO: no effect. */
size_t length;
uint8_t *result =
{ /* FLAG_ZERO: no effect. */
size_t length;
uint8_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 uint8_t expected[] = " \303\204rger 33";
ASSERT (result != NULL);
ASSERT (u8_strcmp (result, expected) == 0);
static const uint8_t expected[] = " \303\204rger 33";
ASSERT (result != NULL);
ASSERT (u8_strcmp (result, expected) == 0);