tizen 2.4 release

[framework/base/tizen-locale.git] / iconvdata / utf-16.c

diff --git a/iconvdata/utf-16.c b/iconvdata/utf-16.c
index 7f6c760..75dbe93 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, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1999-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
 
@@ -14,9 +14,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <byteswap.h>
 #include <dlfcn.h>
@@ -40,39 +39,47 @@
 #define MIN_NEEDED_FROM                2
 #define MAX_NEEDED_FROM                4
 #define MIN_NEEDED_TO          4
+#define ONE_DIRECTION          0
 #define FROM_DIRECTION         (dir == from_utf16)
 #define PREPARE_LOOP \
   enum direction dir = ((struct utf16_data *) step->__data)->dir;            \
   enum variant var = ((struct utf16_data *) step->__data)->var;                      \
-  if (__builtin_expect (data->__invocation_counter == 0, 0) && var == UTF_16) \
+  if (__glibc_unlikely (data->__invocation_counter == 0))                    \
     {                                                                        \
-      if (FROM_DIRECTION)                                                    \
+      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 (get16u (inptr) == BOM)                                          \
-           /* Simply ignore the BOM character.  */                           \
-           *inptrp = inptr += 2;                                             \
-         else if (get16u (inptr) == BOM_OE)                                  \
+         if (FROM_DIRECTION)                                                 \
            {                                                                 \
-             ((struct utf16_data *) step->__data)->swap = 1;                 \
-             *inptrp = inptr += 2;                                           \
+             /* 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)                              \
+               {                                                             \
+                 data->__flags |= __GCONV_SWAP;                              \
+                 *inptrp = inptr += 2;                                       \
+               }                                                             \
            }                                                                 \
-       }                                                                     \
-      else if (!FROM_DIRECTION && !data->__internal_use)                     \
-       {                                                                     \
-         /* Emit the Byte Order Mark.  */                                    \
-         if (__builtin_expect (outbuf + 2 > outend, 0))                      \
-           return __GCONV_FULL_OUTPUT;                                       \
+         else if (!FROM_DIRECTION && !data->__internal_use)                  \
+           {                                                                 \
+             /* Emit the Byte Order Mark.  */                                \
+             if (__glibc_unlikely (outbuf + 2 > outend))                     \
+               return __GCONV_FULL_OUTPUT;                                   \
                                                                              \
-         put16u (outbuf, BOM);                                               \
-         outbuf += 2;                                                        \
+             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;                                        \
     }                                                                        \
-  int swap = ((struct utf16_data *) step->__data)->swap;
+  const int swap = data->__flags & __GCONV_SWAP;
 #define EXTRA_LOOP_ARGS                , swap
 
 
@@ -96,7 +103,6 @@ struct utf16_data
 {
   enum direction dir;
   enum variant var;
-  int swap;
 };
 
 
@@ -151,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)
@@ -198,7 +201,7 @@ gconv_end (struct __gconv_step *data)
   {                                                                          \
     uint32_t c = get32 (inptr);                                                      \
                                                                              \
-    if (__builtin_expect (c >= 0xd800 && c < 0xe000, 0))                     \
+    if (__glibc_unlikely (c >= 0xd800 && c < 0xe000))                        \
       {                                                                              \
        /* Surrogate characters in UCS-4 input are not valid.                 \
           We must catch this.  If we let surrogates pass through,            \
@@ -214,15 +217,15 @@ gconv_end (struct __gconv_step *data)
                                                                              \
     if (swap)                                                                \
       {                                                                              \
-       if (__builtin_expect (c >= 0x10000, 0))                               \
+       if (__glibc_unlikely (c >= 0x10000))                                  \
          {                                                                   \
-           if (__builtin_expect (c >= 0x110000, 0))                          \
+           if (__glibc_unlikely (c >= 0x110000))                             \
              {                                                               \
                STANDARD_TO_LOOP_ERR_HANDLER (4);                             \
              }                                                               \
                                                                              \
            /* Generate a surrogate character.  */                            \
-           if (__builtin_expect (outptr + 4 > outend, 0))                    \
+           if (__glibc_unlikely (outptr + 4 > outend))                       \
              {                                                               \
                /* Overflow in the output buffer.  */                         \
                result = __GCONV_FULL_OUTPUT;                                 \
@@ -238,15 +241,15 @@ gconv_end (struct __gconv_step *data)
       }                                                                              \
     else                                                                     \
       {                                                                              \
-       if (__builtin_expect (c >= 0x10000, 0))                               \
+       if (__glibc_unlikely (c >= 0x10000))                                  \
          {                                                                   \
-           if (__builtin_expect (c >= 0x110000, 0))                          \
+           if (__glibc_unlikely (c >= 0x110000))                             \
              {                                                               \
                STANDARD_TO_LOOP_ERR_HANDLER (4);                             \
              }                                                               \
                                                                              \
            /* Generate a surrogate character.  */                            \
-           if (__builtin_expect (outptr + 4 > outend, 0))                    \
+           if (__glibc_unlikely (outptr + 4 > outend))                       \
              {                                                               \
                /* Overflow in the output buffer.  */                         \
                result = __GCONV_FULL_OUTPUT;                                 \
@@ -294,7 +297,7 @@ gconv_end (struct __gconv_step *data)
                                                                              \
            /* It's a surrogate character.  At least the first word says      \
               it is.  */                                                     \
-           if (__builtin_expect (inptr + 4 > inend, 0))                      \
+           if (__glibc_unlikely (inptr + 4 > inend))                         \
              {                                                               \
                /* We don't have enough input for another complete input      \
                   character.  */                                             \
@@ -328,7 +331,7 @@ gconv_end (struct __gconv_step *data)
          {                                                                   \
            /* It's a surrogate character.  At least the first word says      \
               it is.  */                                                     \
-           if (__builtin_expect (inptr + 4 > inend, 0))                      \
+           if (__glibc_unlikely (inptr + 4 > inend))                         \
              {                                                               \
                /* We don't have enough input for another complete input      \
                   character.  */                                             \