projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
progname: also set global program_invocation_name, when possible.
[gnulib.git]
/
tests
/
uniconv
/
test-u16-conv-from-enc.c
diff --git
a/tests/uniconv/test-u16-conv-from-enc.c
b/tests/uniconv/test-u16-conv-from-enc.c
index
24bc7e6
..
1d1594e
100644
(file)
--- a/
tests/uniconv/test-u16-conv-from-enc.c
+++ b/
tests/uniconv/test-u16-conv-from-enc.c
@@
-1,10
+1,10
@@
/* Test of conversion to UTF-16 from legacy encodings.
/* Test of conversion to UTF-16 from legacy encodings.
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007
-2009
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. */
@@
-34,6
+33,7
@@
if (!(expr)) \
{ \
fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
if (!(expr)) \
{ \
fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+ fflush (stderr); \
abort (); \
} \
} \
abort (); \
} \
} \
@@
-77,15
+77,14
@@
main ()
for (o = 0; o < 2; o++)
{
size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
for (o = 0; o < 2; o++)
{
size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
- uint16_t *result = NULL;
- size_t length = 0;
- int retval = u16_conv_from_encoding ("ISO-8859-1", handler,
- input, strlen (input),
- offsets,
- &result, &length);
- ASSERT (retval == 0);
+ size_t length;
+ uint16_t *result = u16_conv_from_encoding ("ISO-8859-1", handler,
+ input, strlen (input),
+ offsets,
+ NULL, &length);
+ ASSERT (result != NULL);
ASSERT (length == SIZEOF (expected));
ASSERT (length == SIZEOF (expected));
- ASSERT (
result != NULL &&
u16_cmp (result, expected, SIZEOF (expected)) == 0);
+ ASSERT (u16_cmp (result, expected, SIZEOF (expected)) == 0);
if (o)
{
for (i = 0; i < 37; i++)
if (o)
{
for (i = 0; i < 37; i++)
@@
-110,15
+109,14
@@
main ()
for (o = 0; o < 2; o++)
{
size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
for (o = 0; o < 2; o++)
{
size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
- uint16_t *result = NULL;
- size_t length = 0;
- int retval = u16_conv_from_encoding ("ISO-8859-2", handler,
- input, strlen (input),
- offsets,
- &result, &length);
- ASSERT (retval == 0);
+ size_t length;
+ uint16_t *result = u16_conv_from_encoding ("ISO-8859-2", handler,
+ input, strlen (input),
+ offsets,
+ NULL, &length);
+ ASSERT (result != NULL);
ASSERT (length == SIZEOF (expected));
ASSERT (length == SIZEOF (expected));
- ASSERT (
result != NULL &&
u16_cmp (result, expected, SIZEOF (expected)) == 0);
+ ASSERT (u16_cmp (result, expected, SIZEOF (expected)) == 0);
if (o)
{
for (i = 0; i < 16; i++)
if (o)
{
for (i = 0; i < 16; i++)
@@
-131,7
+129,7
@@
main ()
}
/* autodetect_jp is only supported when iconv() support ISO-2022-JP-2. */
}
/* autodetect_jp is only supported when iconv() support ISO-2022-JP-2. */
-# if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__)
+# if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__
|| defined __sun
)
/* Test conversions from autodetect_jp to UTF-16. */
for (h = 0; h < SIZEOF (handlers); h++)
{
/* Test conversions from autodetect_jp to UTF-16. */
for (h = 0; h < SIZEOF (handlers); h++)
{
@@
-144,15
+142,14
@@
main ()
for (o = 0; o < 2; o++)
{
size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
for (o = 0; o < 2; o++)
{
size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
- uint16_t *result = NULL;
- size_t length = 0;
- int retval = u16_conv_from_encoding ("autodetect_jp", handler,
- input, strlen (input),
- offsets,
- &result, &length);
- ASSERT (retval == 0);
+ size_t length;
+ uint16_t *result = u16_conv_from_encoding ("autodetect_jp", handler,
+ input, strlen (input),
+ offsets,
+ NULL, &length);
+ ASSERT (result != NULL);
ASSERT (length == SIZEOF (expected));
ASSERT (length == SIZEOF (expected));
- ASSERT (
result != NULL &&
u16_cmp (result, expected, SIZEOF (expected)) == 0);
+ ASSERT (u16_cmp (result, expected, SIZEOF (expected)) == 0);
if (o)
{
for (i = 0; i < 10; i++)
if (o)
{
for (i = 0; i < 10; i++)
@@
-174,15
+171,14
@@
main ()
for (o = 0; o < 2; o++)
{
size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
for (o = 0; o < 2; o++)
{
size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
- uint16_t *result = NULL;
- size_t length = 0;
- int retval = u16_conv_from_encoding ("autodetect_jp", handler,
- input, strlen (input),
- offsets,
- &result, &length);
- ASSERT (retval == 0);
+ size_t length;
+ uint16_t *result = u16_conv_from_encoding ("autodetect_jp", handler,
+ input, strlen (input),
+ offsets,
+ NULL, &length);
+ ASSERT (result != NULL);
ASSERT (length == SIZEOF (expected));
ASSERT (length == SIZEOF (expected));
- ASSERT (
result != NULL &&
u16_cmp (result, expected, SIZEOF (expected)) == 0);
+ ASSERT (u16_cmp (result, expected, SIZEOF (expected)) == 0);
if (o)
{
for (i = 0; i < 10; i++)
if (o)
{
for (i = 0; i < 10; i++)
@@
-204,15
+200,14
@@
main ()
for (o = 0; o < 2; o++)
{
size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
for (o = 0; o < 2; o++)
{
size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
- uint16_t *result = NULL;
- size_t length = 0;
- int retval = u16_conv_from_encoding ("autodetect_jp", handler,
- input, strlen (input),
- offsets,
- &result, &length);
- ASSERT (retval == 0);
+ size_t length;
+ uint16_t *result = u16_conv_from_encoding ("autodetect_jp", handler,
+ input, strlen (input),
+ offsets,
+ NULL, &length);
+ ASSERT (result != NULL);
ASSERT (length == SIZEOF (expected));
ASSERT (length == SIZEOF (expected));
- ASSERT (
result != NULL &&
u16_cmp (result, expected, SIZEOF (expected)) == 0);
+ ASSERT (u16_cmp (result, expected, SIZEOF (expected)) == 0);
if (o)
{
for (i = 0; i < 16; i++)
if (o)
{
for (i = 0; i < 16; i++)