Merge commit 'upstream/0.9.3'

1 files changed, 107 insertions, 120 deletions

diff --git a/tests/uniconv/test-u8-conv-from-enc.c b/tests/uniconv/test-u8-conv-from-enc.c
index ec8703cc..9655c751 100644
--- a/tests/uniconv/test-u8-conv-from-enc.c
+++ b/tests/uniconv/test-u8-conv-from-enc.c
@@ -1,5 +1,5 @@
 /* Test of conversion to UTF-8 from legacy encodings.
-   Copyright (C) 2007-2009 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 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
@@ -20,24 +20,11 @@
 
 #include "uniconv.h"
 
-#include <stdio.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__); \
-          fflush (stderr);						     \
-          abort ();							     \
-        }								     \
-    }									     \
-  while (0)
+#include "macros.h"
 
 /* Magic number for detecting bounds violations.  */
 #define MAGIC 0x1983EFF1
@@ -70,28 +57,28 @@ main ()
       static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
       static const uint8_t expected[] = "\303\204rger mit b\303\266sen B\303\274bchen ohne Augenma\303\237";
       for (o = 0; o < 2; o++)
-	{
-	  size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
-	  size_t length;
-	  uint8_t *result = u8_conv_from_encoding ("ISO-8859-1", handler,
-						   input, strlen (input),
-						   offsets,
-						   NULL, &length);
-	  ASSERT (result != NULL);
-	  ASSERT (length == u8_strlen (expected));
-	  ASSERT (u8_cmp (result, expected, u8_strlen (expected)) == 0);
-	  if (o)
-	    {
-	      for (i = 0; i < 37; i++)
-		ASSERT (offsets[i] == (i < 1 ? i :
-				       i < 12 ? i + 1 :
-				       i < 18 ? i + 2 :
-				       i + 3));
-	      ASSERT (offsets[37] == MAGIC);
-	      free (offsets);
-	    }
-	  free (result);
-	}
+        {
+          size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
+          size_t length;
+          uint8_t *result = u8_conv_from_encoding ("ISO-8859-1", handler,
+                                                   input, strlen (input),
+                                                   offsets,
+                                                   NULL, &length);
+          ASSERT (result != NULL);
+          ASSERT (length == u8_strlen (expected));
+          ASSERT (u8_cmp (result, expected, u8_strlen (expected)) == 0);
+          if (o)
+            {
+              for (i = 0; i < 37; i++)
+                ASSERT (offsets[i] == (i < 1 ? i :
+                                       i < 12 ? i + 1 :
+                                       i < 18 ? i + 2 :
+                                       i + 3));
+              ASSERT (offsets[37] == MAGIC);
+              free (offsets);
+            }
+          free (result);
+        }
     }
 
   /* Test conversion from ISO-8859-2 to UTF-8 with no errors.  */
@@ -101,26 +88,26 @@ main ()
       static const char input[] = "Rafa\263 Maszkowski"; /* Rafał Maszkowski */
       static const uint8_t expected[] = "Rafa\305\202 Maszkowski";
       for (o = 0; o < 2; o++)
-	{
-	  size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
-	  size_t length;
-	  uint8_t *result = u8_conv_from_encoding ("ISO-8859-2", handler,
-						   input, strlen (input),
-						   offsets,
-						   NULL, &length);
-	  ASSERT (result != NULL);
-	  ASSERT (length == u8_strlen (expected));
-	  ASSERT (u8_cmp (result, expected, u8_strlen (expected)) == 0);
-	  if (o)
-	    {
-	      for (i = 0; i < 16; i++)
-		ASSERT (offsets[i] == (i < 5 ? i :
-				       i + 1));
-	      ASSERT (offsets[16] == MAGIC);
-	      free (offsets);
-	    }
-	  free (result);
-	}
+        {
+          size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
+          size_t length;
+          uint8_t *result = u8_conv_from_encoding ("ISO-8859-2", handler,
+                                                   input, strlen (input),
+                                                   offsets,
+                                                   NULL, &length);
+          ASSERT (result != NULL);
+          ASSERT (length == u8_strlen (expected));
+          ASSERT (u8_cmp (result, expected, u8_strlen (expected)) == 0);
+          if (o)
+            {
+              for (i = 0; i < 16; i++)
+                ASSERT (offsets[i] == (i < 5 ? i :
+                                       i + 1));
+              ASSERT (offsets[16] == MAGIC);
+              free (offsets);
+            }
+          free (result);
+        }
     }
 
   /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
@@ -132,25 +119,25 @@ main ()
       static const char input[] = "\244\263\244\363\244\313\244\301\244\317"; /* こんにちは in EUC-JP */
       static const uint8_t expected[] = "\343\201\223\343\202\223\343\201\253\343\201\241\343\201\257"; /* こんにちは */
       for (o = 0; o < 2; o++)
-	{
-	  size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
-	  size_t length;
-	  uint8_t *result = u8_conv_from_encoding ("autodetect_jp", handler,
-						   input, strlen (input),
-						   offsets,
-						   NULL, &length);
-	  ASSERT (result != NULL);
-	  ASSERT (length == u8_strlen (expected));
-	  ASSERT (u8_cmp (result, expected, u8_strlen (expected)) == 0);
-	  if (o)
-	    {
-	      for (i = 0; i < 10; i++)
-		ASSERT (offsets[i] == ((i % 2) == 0 ? (i / 2) * 3 : (size_t)(-1)));
-	      ASSERT (offsets[10] == MAGIC);
-	      free (offsets);
-	    }
-	  free (result);
-	}
+        {
+          size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
+          size_t length;
+          uint8_t *result = u8_conv_from_encoding ("autodetect_jp", handler,
+                                                   input, strlen (input),
+                                                   offsets,
+                                                   NULL, &length);
+          ASSERT (result != NULL);
+          ASSERT (length == u8_strlen (expected));
+          ASSERT (u8_cmp (result, expected, u8_strlen (expected)) == 0);
+          if (o)
+            {
+              for (i = 0; i < 10; i++)
+                ASSERT (offsets[i] == ((i % 2) == 0 ? (i / 2) * 3 : (size_t)(-1)));
+              ASSERT (offsets[10] == MAGIC);
+              free (offsets);
+            }
+          free (result);
+        }
     }
   for (h = 0; h < SIZEOF (handlers); h++)
     {
@@ -158,25 +145,25 @@ main ()
       static const char input[] = "\202\261\202\361\202\311\202\277\202\315"; /* こんにちは in Shift_JIS */
       static const uint8_t expected[] = "\343\201\223\343\202\223\343\201\253\343\201\241\343\201\257"; /* こんにちは */
       for (o = 0; o < 2; o++)
-	{
-	  size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
-	  size_t length;
-	  uint8_t *result = u8_conv_from_encoding ("autodetect_jp", handler,
-						   input, strlen (input),
-						   offsets,
-						   NULL, &length);
-	  ASSERT (result != NULL);
-	  ASSERT (length == u8_strlen (expected));
-	  ASSERT (u8_cmp (result, expected, u8_strlen (expected)) == 0);
-	  if (o)
-	    {
-	      for (i = 0; i < 10; i++)
-		ASSERT (offsets[i] == ((i % 2) == 0 ? (i / 2) * 3 : (size_t)(-1)));
-	      ASSERT (offsets[10] == MAGIC);
-	      free (offsets);
-	    }
-	  free (result);
-	}
+        {
+          size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
+          size_t length;
+          uint8_t *result = u8_conv_from_encoding ("autodetect_jp", handler,
+                                                   input, strlen (input),
+                                                   offsets,
+                                                   NULL, &length);
+          ASSERT (result != NULL);
+          ASSERT (length == u8_strlen (expected));
+          ASSERT (u8_cmp (result, expected, u8_strlen (expected)) == 0);
+          if (o)
+            {
+              for (i = 0; i < 10; i++)
+                ASSERT (offsets[i] == ((i % 2) == 0 ? (i / 2) * 3 : (size_t)(-1)));
+              ASSERT (offsets[10] == MAGIC);
+              free (offsets);
+            }
+          free (result);
+        }
     }
   for (h = 0; h < SIZEOF (handlers); h++)
     {
@@ -184,31 +171,31 @@ main ()
       static const char input[] = "\033$B$3$s$K$A$O\033(B"; /* こんにちは in ISO-2022-JP-2 */
       static const uint8_t expected[] = "\343\201\223\343\202\223\343\201\253\343\201\241\343\201\257"; /* こんにちは */
       for (o = 0; o < 2; o++)
-	{
-	  size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
-	  size_t length;
-	  uint8_t *result = u8_conv_from_encoding ("autodetect_jp", handler,
-						   input, strlen (input),
-						   offsets,
-						   NULL, &length);
-	  ASSERT (result != NULL);
-	  ASSERT (length == u8_strlen (expected));
-	  ASSERT (u8_cmp (result, expected, u8_strlen (expected)) == 0);
-	  if (o)
-	    {
-	      for (i = 0; i < 16; i++)
-		ASSERT (offsets[i] == (i == 0 ? 0 :
-				       i == 5 ? 3 :
-				       i == 7 ? 6 :
-				       i == 9 ? 9 :
-				       i == 11 ? 12 :
-				       i == 13 ? 15 :
-				       (size_t)(-1)));
-	      ASSERT (offsets[16] == MAGIC);
-	      free (offsets);
-	    }
-	  free (result);
-	}
+        {
+          size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
+          size_t length;
+          uint8_t *result = u8_conv_from_encoding ("autodetect_jp", handler,
+                                                   input, strlen (input),
+                                                   offsets,
+                                                   NULL, &length);
+          ASSERT (result != NULL);
+          ASSERT (length == u8_strlen (expected));
+          ASSERT (u8_cmp (result, expected, u8_strlen (expected)) == 0);
+          if (o)
+            {
+              for (i = 0; i < 16; i++)
+                ASSERT (offsets[i] == (i == 0 ? 0 :
+                                       i == 5 ? 3 :
+                                       i == 7 ? 6 :
+                                       i == 9 ? 9 :
+                                       i == 11 ? 12 :
+                                       i == 13 ? 15 :
+                                       (size_t)(-1)));
+              ASSERT (offsets[16] == MAGIC);
+              free (offsets);
+            }
+          free (result);
+        }
     }
 # endif