/* Test of conversion to UTF-32 from legacy encodings.
- Copyright (C) 2007-2008 Free Software Foundation, Inc.
+ Copyright (C) 2007-2009 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
for (o = 0; o < 2; o++)
{
size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
- uint32_t *result = NULL;
- size_t length = 0;
- int retval = u32_conv_from_encoding ("ISO-8859-1", handler,
- input, strlen (input),
- offsets,
- &result, &length);
- ASSERT (retval == 0);
+ size_t length;
+ uint32_t *result = u32_conv_from_encoding ("ISO-8859-1", handler,
+ input, strlen (input),
+ offsets,
+ NULL, &length);
+ ASSERT (result != NULL);
ASSERT (length == SIZEOF (expected));
- ASSERT (result != NULL && u32_cmp (result, expected, SIZEOF (expected)) == 0);
+ ASSERT (u32_cmp (result, expected, SIZEOF (expected)) == 0);
if (o)
{
for (i = 0; i < 37; i++)
for (o = 0; o < 2; o++)
{
size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
- uint32_t *result = NULL;
- size_t length = 0;
- int retval = u32_conv_from_encoding ("ISO-8859-2", handler,
- input, strlen (input),
- offsets,
- &result, &length);
- ASSERT (retval == 0);
+ size_t length;
+ uint32_t *result = u32_conv_from_encoding ("ISO-8859-2", handler,
+ input, strlen (input),
+ offsets,
+ NULL, &length);
+ ASSERT (result != NULL);
ASSERT (length == SIZEOF (expected));
- ASSERT (result != NULL && u32_cmp (result, expected, SIZEOF (expected)) == 0);
+ ASSERT (u32_cmp (result, expected, SIZEOF (expected)) == 0);
if (o)
{
for (i = 0; i < 16; i++)
}
/* 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++)
{
for (o = 0; o < 2; o++)
{
size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
- uint32_t *result = NULL;
- size_t length = 0;
- int retval = u32_conv_from_encoding ("autodetect_jp", handler,
- input, strlen (input),
- offsets,
- &result, &length);
- ASSERT (retval == 0);
+ size_t length;
+ uint32_t *result = u32_conv_from_encoding ("autodetect_jp", handler,
+ input, strlen (input),
+ offsets,
+ NULL, &length);
+ ASSERT (result != NULL);
ASSERT (length == SIZEOF (expected));
- ASSERT (result != NULL && u32_cmp (result, expected, SIZEOF (expected)) == 0);
+ ASSERT (u32_cmp (result, expected, SIZEOF (expected)) == 0);
if (o)
{
for (i = 0; i < 10; i++)
for (o = 0; o < 2; o++)
{
size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
- uint32_t *result = NULL;
- size_t length = 0;
- int retval = u32_conv_from_encoding ("autodetect_jp", handler,
- input, strlen (input),
- offsets,
- &result, &length);
- ASSERT (retval == 0);
+ size_t length;
+ uint32_t *result = u32_conv_from_encoding ("autodetect_jp", handler,
+ input, strlen (input),
+ offsets,
+ NULL, &length);
+ ASSERT (result != NULL);
ASSERT (length == SIZEOF (expected));
- ASSERT (result != NULL && u32_cmp (result, expected, SIZEOF (expected)) == 0);
+ ASSERT (u32_cmp (result, expected, SIZEOF (expected)) == 0);
if (o)
{
for (i = 0; i < 10; i++)
for (o = 0; o < 2; o++)
{
size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
- uint32_t *result = NULL;
- size_t length = 0;
- int retval = u32_conv_from_encoding ("autodetect_jp", handler,
- input, strlen (input),
- offsets,
- &result, &length);
- ASSERT (retval == 0);
+ size_t length;
+ uint32_t *result = u32_conv_from_encoding ("autodetect_jp", handler,
+ input, strlen (input),
+ offsets,
+ NULL, &length);
+ ASSERT (result != NULL);
ASSERT (length == SIZEOF (expected));
- ASSERT (result != NULL && u32_cmp (result, expected, SIZEOF (expected)) == 0);
+ ASSERT (u32_cmp (result, expected, SIZEOF (expected)) == 0);
if (o)
{
for (i = 0; i < 16; i++)