Store invocation-specific data of conversion modules in __gconv_step_data

[platform/upstream/glibc.git] / iconvdata / utf-16.c

diff --git a/iconvdata/utf-16.c b/iconvdata/utf-16.c
index 6b0dd9c..e34d23f 100644 (file)
--- a/iconvdata/utf-16.c
+++ b/iconvdata/utf-16.c
@@ -1,5 +1,5 @@
 /* Conversion module for UTF-16.
-   Copyright (C) 1999, 2000-2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000-2002, 2003, 2005, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
 
@@ -44,38 +44,43 @@
 #define PREPARE_LOOP \
   enum direction dir = ((struct utf16_data *) step->__data)->dir;            \
   enum variant var = ((struct utf16_data *) step->__data)->var;                      \
-  int swap;                                                                  \
-  if (FROM_DIRECTION && var == UTF_16)                                       \
+  if (__builtin_expect (data->__invocation_counter == 0, 0))                 \
     {                                                                        \
-      if (data->__invocation_counter == 0)                                   \
+      if (var == UTF_16)                                                     \
        {                                                                     \
-         /* We have to find out which byte order the file is encoded in.  */ \
-         if (inptr + 2 > inend)                                              \
-           return (inptr == inend                                            \
-                   ? __GCONV_EMPTY_INPUT : __GCONV_INCOMPLETE_INPUT);        \
+         if (FROM_DIRECTION)                                                 \
+           {                                                                 \
+             /* We have to find out which byte order the file is             \
+                encoded in.  */                                              \
+             if (inptr + 2 > inend)                                          \
+               return (inptr == inend                                        \
+                       ? __GCONV_EMPTY_INPUT : __GCONV_INCOMPLETE_INPUT);    \
                                                                              \
-         if (get16u (inptr) == BOM)                                          \
-           /* Simply ignore the BOM character.  */                           \
-           *inptrp = inptr += 2;                                             \
-         else if (get16u (inptr) == BOM_OE)                                  \
+             if (get16u (inptr) == BOM)                                      \
+               /* Simply ignore the BOM character.  */                       \
+               *inptrp = inptr += 2;                                         \
+             else if (get16u (inptr) == BOM_OE)                              \
+               {                                                             \
+                 data->__flags |= __GCONV_SWAP;                              \
+                 *inptrp = inptr += 2;                                       \
+               }                                                             \
+           }                                                                 \
+         else if (!FROM_DIRECTION && !data->__internal_use)                  \
            {                                                                 \
-             ((struct utf16_data *) step->__data)->swap = 1;                 \
-             *inptrp = inptr += 2;                                           \
+             /* Emit the Byte Order Mark.  */                                \
+             if (__builtin_expect (outbuf + 2 > outend, 0))                  \
+               return __GCONV_FULL_OUTPUT;                                   \
+                                                                             \
+             put16u (outbuf, BOM);                                           \
+             outbuf += 2;                                                    \
            }                                                                 \
        }                                                                     \
+      else if ((var == UTF_16LE && BYTE_ORDER == BIG_ENDIAN)                 \
+              || (var == UTF_16BE && BYTE_ORDER == LITTLE_ENDIAN))           \
+       data->__flags |= __GCONV_SWAP;                                        \
     }                                                                        \
-  else if (!FROM_DIRECTION && var == UTF_16 && !data->__internal_use         \
-          && data->__invocation_counter == 0)                                \
-    {                                                                        \
-      /* Emit the Byte Order Mark.  */                                       \
-      if (__builtin_expect (outbuf + 2 > outend, 0))                         \
-       return __GCONV_FULL_OUTPUT;                                           \
-                                                                             \
-      put16u (outbuf, BOM);                                                  \
-      outbuf += 2;                                                           \
-    }                                                                        \
-  swap = ((struct utf16_data *) step->__data)->swap;
-#define EXTRA_LOOP_ARGS                , var, swap
+  const int swap = data->__flags & __GCONV_SWAP;
+#define EXTRA_LOOP_ARGS                , swap
 
 
 /* Direction of the transformation.  */
@@ -98,7 +103,6 @@ struct utf16_data
 {
   enum direction dir;
   enum variant var;
-  int swap;
 };
 
 
@@ -153,9 +157,6 @@ gconv_init (struct __gconv_step *step)
        {
          new_data->dir = dir;
          new_data->var = var;
-         new_data->swap = ((var == UTF_16LE && BYTE_ORDER == BIG_ENDIAN)
-                           || (var == UTF_16BE
-                               && BYTE_ORDER == LITTLE_ENDIAN));
          step->__data = new_data;
 
          if (dir == from_utf16)
@@ -267,7 +268,7 @@ gconv_end (struct __gconv_step *data)
   }
 #define LOOP_NEED_FLAGS
 #define EXTRA_LOOP_DECLS \
-       , enum variant var, int swap
+       , int swap
 #include <iconv/loop.c>
 
 
@@ -328,8 +329,6 @@ gconv_end (struct __gconv_step *data)
          }                                                                   \
        else                                                                  \
          {                                                                   \
-           uint16_t u2;                                                      \
-                                                                             \
            /* It's a surrogate character.  At least the first word says      \
               it is.  */                                                     \
            if (__builtin_expect (inptr + 4 > inend, 0))                      \
@@ -341,7 +340,7 @@ gconv_end (struct __gconv_step *data)
              }                                                               \
                                                                              \
            inptr += 2;                                                       \
-           u2 = get16 (inptr);                                               \
+           uint16_t u2 = get16 (inptr);                                      \
            if (__builtin_expect (u2 < 0xdc00, 0)                             \
                || __builtin_expect (u2 > 0xdfff, 0))                         \
              {                                                               \
@@ -358,7 +357,7 @@ gconv_end (struct __gconv_step *data)
   }
 #define LOOP_NEED_FLAGS
 #define EXTRA_LOOP_DECLS \
-       , enum variant var, int swap
+       , int swap
 #include <iconv/loop.c>