X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests%2Funiconv%2Ftest-u8-conv-to-enc.c;h=271fb05181314eeb62d7d0f83855e9b83f0ee6b8;hb=02fd4eb4561842dee666b709fbbb1632c4357d2d;hp=f30b1c5f2c87bf079dd9de8de7369f9cb86f6701;hpb=0b3bdc0bdf2a21d76291e20305041f46623d1e0f;p=gnulib.git

diff --git a/tests/uniconv/test-u8-conv-to-enc.c b/tests/uniconv/test-u8-conv-to-enc.c
index f30b1c5f2..271fb0518 100644
--- a/tests/uniconv/test-u8-conv-to-enc.c
+++ b/tests/uniconv/test-u8-conv-to-enc.c
@@ -1,5 +1,5 @@
 /* Test of conversion from UTF-8 to 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
@@ -73,15 +73,13 @@ main ()
       for (o = 0; o < 2; o++)
 	{
 	  size_t *offsets = (o ? new_offsets (u8_strlen (input)) : NULL);
-	  char *result = NULL;
-	  size_t length = 0;
-	  int retval = u8_conv_to_encoding ("ISO-8859-1", handler,
-					    input, u8_strlen (input),
-					    offsets,
-					    &result, &length);
-	  ASSERT (retval == 0);
-	  ASSERT (length == strlen (expected));
+	  size_t length;
+	  char *result = u8_conv_to_encoding ("ISO-8859-1", handler,
+					      input, u8_strlen (input),
+					      offsets,
+					      NULL, &length);
 	  ASSERT (result != NULL);
+	  ASSERT (length == strlen (expected));
 	  ASSERT (memcmp (result, expected, length) == 0);
 	  if (o)
 	    {
@@ -110,26 +108,24 @@ main ()
       for (o = 0; o < 2; o++)
 	{
 	  size_t *offsets = (o ? new_offsets (u8_strlen (input)) : NULL);
-	  char *result = NULL;
-	  size_t length = 0;
-	  int retval = u8_conv_to_encoding ("ISO-8859-1", handler,
-					    input, u8_strlen (input),
-					    offsets,
-					    &result, &length);
+	  size_t length = 0xdead;
+	  char *result = u8_conv_to_encoding ("ISO-8859-1", handler,
+					      input, u8_strlen (input),
+					      offsets,
+					      NULL, &length);
 	  switch (handler)
 	    {
 	    case iconveh_error:
-	      ASSERT (retval == -1 && errno == EILSEQ);
 	      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";
-		ASSERT (retval == 0);
-		ASSERT (length == strlen (expected));
 		ASSERT (result != NULL);
+		ASSERT (length == strlen (expected));
 		ASSERT (memcmp (result, expected, length) == 0
 			|| memcmp (result, expected_translit, length) == 0);
 		if (o)
@@ -147,9 +143,8 @@ main ()
 	    case iconveh_escape_sequence:
 	      {
 		static const char expected[] = "Rafa\\u0142 Maszkowski";
-		ASSERT (retval == 0);
-		ASSERT (length == strlen (expected));
 		ASSERT (result != NULL);
+		ASSERT (length == strlen (expected));
 		ASSERT (memcmp (result, expected, length) == 0);
 		if (o)
 		  {
@@ -175,15 +170,13 @@ main ()
       for (o = 0; o < 2; o++)
 	{
 	  size_t *offsets = (o ? new_offsets (u8_strlen (input)) : NULL);
-	  char *result = NULL;
-	  size_t length = 0;
-	  int retval = u8_conv_to_encoding ("ISO-8859-1", handler,
-					    input, u8_strlen (input),
-					    offsets,
-					    &result, &length);
-	  ASSERT (retval == 0);
+	  size_t length;
+	  char *result = u8_conv_to_encoding ("ISO-8859-1", handler,
+					      input, u8_strlen (input),
+					      offsets,
+					      NULL, &length);
+	  ASSERT (result != NULL);
 	  ASSERT (length == strlen (""));
-	  /* result may be == NULL or != NULL.  */
 	  if (o)
 	    {
 	      ASSERT (offsets[0] == 0);