projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
w32sock: leave win32 error in place.
[gnulib.git]
/
tests
/
uniconv
/
test-u16-conv-to-enc.c
diff --git
a/tests/uniconv/test-u16-conv-to-enc.c
b/tests/uniconv/test-u16-conv-to-enc.c
index
26be776
..
a2dc3c6
100644
(file)
--- a/
tests/uniconv/test-u16-conv-to-enc.c
+++ b/
tests/uniconv/test-u16-conv-to-enc.c
@@
-1,5
+1,5
@@
/* Test of conversion from UTF-16 to legacy encodings.
/* Test of conversion from UTF-16 to legacy encodings.
- Copyright (C) 2007-200
8
Free Software Foundation, Inc.
+ Copyright (C) 2007-200
9
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
@@
-76,15
+76,13
@@
main ()
for (o = 0; o < 2; o++)
{
size_t *offsets = (o ? new_offsets (SIZEOF (input)) : NULL);
for (o = 0; o < 2; o++)
{
size_t *offsets = (o ? new_offsets (SIZEOF (input)) : NULL);
- char *result = NULL;
- size_t length = 0;
- int retval = u16_conv_to_encoding ("ISO-8859-1", handler,
- input, SIZEOF (input),
- offsets,
- &result, &length);
- ASSERT (retval == 0);
- ASSERT (length == strlen (expected));
+ size_t length;
+ char *result = u16_conv_to_encoding ("ISO-8859-1", handler,
+ input, SIZEOF (input),
+ offsets,
+ NULL, &length);
ASSERT (result != NULL);
ASSERT (result != NULL);
+ ASSERT (length == strlen (expected));
ASSERT (memcmp (result, expected, length) == 0);
if (o)
{
ASSERT (memcmp (result, expected, length) == 0);
if (o)
{
@@
-109,26
+107,24
@@
main ()
for (o = 0; o < 2; o++)
{
size_t *offsets = (o ? new_offsets (SIZEOF (input)) : NULL);
for (o = 0; o < 2; o++)
{
size_t *offsets = (o ? new_offsets (SIZEOF (input)) : NULL);
- char *result = NULL;
- size_t length = 0;
- int retval = u16_conv_to_encoding ("ISO-8859-1", handler,
- input, SIZEOF (input),
- offsets,
- &result, &length);
+ size_t length = 0xdead;
+ char *result = u16_conv_to_encoding ("ISO-8859-1", handler,
+ input, SIZEOF (input),
+ offsets,
+ NULL, &length);
switch (handler)
{
case iconveh_error:
switch (handler)
{
case iconveh_error:
- ASSERT (retval == -1 && errno == EILSEQ);
ASSERT (result == NULL);
ASSERT (result == NULL);
- ASSERT (length == 0);
+ ASSERT (errno == EILSEQ);
+ ASSERT (length == 0xdead);
break;
case iconveh_question_mark:
{
static const char expected[] = "Rafa? Maszkowski";
static const char expected_translit[] = "Rafal Maszkowski";
break;
case iconveh_question_mark:
{
static const char expected[] = "Rafa? Maszkowski";
static const char expected_translit[] = "Rafal Maszkowski";
- ASSERT (retval == 0);
- ASSERT (length == strlen (expected));
ASSERT (result != NULL);
ASSERT (result != NULL);
+ ASSERT (length == strlen (expected));
ASSERT (memcmp (result, expected, length) == 0
|| memcmp (result, expected_translit, length) == 0);
if (o)
ASSERT (memcmp (result, expected, length) == 0
|| memcmp (result, expected_translit, length) == 0);
if (o)
@@
-144,9
+140,8
@@
main ()
case iconveh_escape_sequence:
{
static const char expected[] = "Rafa\\u0142 Maszkowski";
case iconveh_escape_sequence:
{
static const char expected[] = "Rafa\\u0142 Maszkowski";
- ASSERT (retval == 0);
- ASSERT (length == strlen (expected));
ASSERT (result != NULL);
ASSERT (result != NULL);
+ ASSERT (length == strlen (expected));
ASSERT (memcmp (result, expected, length) == 0);
if (o)
{
ASSERT (memcmp (result, expected, length) == 0);
if (o)
{
@@
-170,15
+165,13
@@
main ()
for (o = 0; o < 2; o++)
{
size_t *offsets = (o ? new_offsets (SIZEOF (input)) : NULL);
for (o = 0; o < 2; o++)
{
size_t *offsets = (o ? new_offsets (SIZEOF (input)) : NULL);
- char *result = NULL;
- size_t length = 0;
- int retval = u16_conv_to_encoding ("ISO-8859-1", handler,
- input, SIZEOF (input),
- offsets,
- &result, &length);
- ASSERT (retval == 0);
+ size_t length;
+ char *result = u16_conv_to_encoding ("ISO-8859-1", handler,
+ input, SIZEOF (input),
+ offsets,
+ NULL, &length);
+ ASSERT (result != NULL);
ASSERT (length == strlen (""));
ASSERT (length == strlen (""));
- /* result may be == NULL or != NULL. */
if (o)
{
ASSERT (offsets[0] == 0);
if (o)
{
ASSERT (offsets[0] == 0);