Fix typos.

diff --git a/iconvdata/euc-kr.c b/iconvdata/euc-kr.c
index f74d7748f9f3cca914ec0bd33a901c5fb44f9a05..d6901b830afef36880a86ab713049ef7cc94df62 100644 (file)
--- a/iconvdata/euc-kr.c
+++ b/iconvdata/euc-kr.c
@@ -28,7 +28,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp)
 {
   if (ch > 0x7f)
     {
-      if (ucs4_to_ksc5601 (ch, cp, 2) != __UNKNOWN_10646_CHAR)
+      if (ucs4_to_ksc5601 (ch, cp, 2) != UNKNOWN_10646_CHAR)
        {
          cp[0] |= 0x80;
          cp[1] |= 0x80;
@@ -81,7 +81,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp)
     else if (ch <= 0xa0 || ch > 0xfe || ch == 0xc9)                          \
       {                                                                              \
        /* This is illegal.  */                                               \
-       result = __GCONV_ILLEGAL_INPUT;                                       \
+       result = GCONV_ILLEGAL_INPUT;                                         \
        break;                                                                \
       }                                                                              \
     else                                                                     \
@@ -93,13 +93,13 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp)
        if (NEED_LENGTH_TEST && ch == 0)                                      \
          {                                                                   \
            /* The second character is not available.  */                     \
-           result = __GCONV_INCOMPLETE_INPUT;                                \
+           result = GCONV_INCOMPLETE_INPUT;                                  \
            break;                                                            \
          }                                                                   \
-       if (ch == __UNKNOWN_10646_CHAR)                                       \
+       if (ch == UNKNOWN_10646_CHAR)                                         \
          {                                                                   \
            /* This is an illegal character.  */                              \
-           result = __GCONV_ILLEGAL_INPUT;                                   \
+           result = GCONV_ILLEGAL_INPUT;                                     \
            break;                                                            \
          }                                                                   \
       }                                                                              \
@@ -126,7 +126,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp)
     if (cp[0] == '\0' && ch != 0)                                            \
       {                                                                              \
        /* Illegal character.  */                                             \
-       result = __GCONV_ILLEGAL_INPUT;                                       \
+       result = GCONV_ILLEGAL_INPUT;                                         \
        break;                                                                \
       }                                                                              \
                                                                              \
@@ -138,7 +138,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp)
          {                                                                   \
            /* The result does not fit into the buffer.  */                   \
            --outptr;                                                         \
-           result = __GCONV_FULL_OUTPUT;                                     \
+           result = GCONV_FULL_OUTPUT;                                       \
            break;                                                            \
          }                                                                   \
        *outptr++ = cp[1];                                                    \

diff --git a/iconvdata/ksc5601.h b/iconvdata/ksc5601.h
index e50d6d6c20af8a0d48f3b20ab30c3651cf6c1290..f129735df3488f3f0cfc5d0f83c729a3eda20715 100644 (file)
--- a/iconvdata/ksc5601.h
+++ b/iconvdata/ksc5601.h
@@ -54,14 +54,14 @@ ksc5601_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset)
 
   if (ch < offset || (ch - offset) <= 0x20 || (ch - offset) >= 0x7e
       || (ch - offset) == 0x49)
-    return __UNKNOWN_10646_CHAR;
+    return UNKNOWN_10646_CHAR;
 
   if (avail < 2)
     return 0;
 
   ch2 = (*s)[1];
   if (ch2 < offset || (ch2 - offset) <= 0x20 || (ch2 - offset) >= 0x7f)
-    return __UNKNOWN_10646_CHAR;
+    return UNKNOWN_10646_CHAR;
 
   idx = (ch - offset - 0x21) * 94 + (ch2 - offset - 0x21);
 
@@ -72,15 +72,15 @@ ksc5601_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset)
 
   if (idx >= 1410 && idx < 1410 + KSC5601_HANGUL)
     return (__ksc5601_hangul_to_ucs[idx - 1410]
-           ?: ((*s) -= 2, __UNKNOWN_10646_CHAR));
+           ?: ((*s) -= 2, UNKNOWN_10646_CHAR));
   else if (idx >= 3854)
     /* Hanja : row 42 - row 93 : 3854 = 94 * (42-1) */
    return (__ksc5601_hanja_to_ucs[idx - 3854]
-          ?: ((*s) -= 2, __UNKNOWN_10646_CHAR));
+          ?: ((*s) -= 2, UNKNOWN_10646_CHAR));
   else if (idx <= 1114)
-    return __ksc5601_sym_to_ucs[idx] ?: ((*s) -= 2, __UNKNOWN_10646_CHAR);
+    return __ksc5601_sym_to_ucs[idx] ?: ((*s) -= 2, UNKNOWN_10646_CHAR);
 
-  return __UNKNOWN_10646_CHAR;
+  return UNKNOWN_10646_CHAR;
 }
 
 static inline size_t
@@ -110,7 +110,7 @@ ucs4_to_ksc5601_hangul (uint32_t wch, unsigned char *s, size_t avail)
        }
     }
 
-  return __UNKNOWN_10646_CHAR;
+  return UNKNOWN_10646_CHAR;
 }
 
 
@@ -141,7 +141,7 @@ ucs4_to_ksc5601_hanja (uint32_t wch, unsigned char *s, size_t avail)
        }
     }
 
-  return __UNKNOWN_10646_CHAR;
+  return UNKNOWN_10646_CHAR;
 }
 
 static inline  size_t
@@ -171,7 +171,7 @@ ucs4_to_ksc5601_sym (uint32_t wch, unsigned char *s, size_t avail)
        }
     }
 
-  return __UNKNOWN_10646_CHAR;
+  return UNKNOWN_10646_CHAR;
 }
 
 

diff --git a/stdlib/mblen.c b/stdlib/mblen.c
index 760da60d738fdf9f783ea76d0554257cc4219888..1788170203da59c38c3850b1da130a0640f423bc 100644 (file)
--- a/stdlib/mblen.c
+++ b/stdlib/mblen.c
@@ -46,7 +46,7 @@ mblen (const char *s, size_t n)
       /* Reset the state.  */
       memset (&state, '\0', sizeof state);
 
-      result = __wcsmbs_gconv_fcts.towc->__stateful;
+      result = __wcsmbs_gconv_fcts.towc->stateful;
     }
   else if (*s == '\0')
     /* According to the ISO C 89 standard this is the expected behaviour.  */

diff --git a/stdlib/mbtowc.c b/stdlib/mbtowc.c
index cba34d32a4aabce62addd48714e13d5c4b7c5e53..74ed3606146331d0e0a92fcc44ba737c27936e20 100644 (file)
--- a/stdlib/mbtowc.c
+++ b/stdlib/mbtowc.c
@@ -50,7 +50,7 @@ mbtowc (wchar_t *pwc, const char *s, size_t n)
         violate ISO C.  */
       memset (&__no_r_state, '\0', sizeof __no_r_state);
 
-      result = __wcsmbs_gconv_fcts.towc->__stateful;
+      result = __wcsmbs_gconv_fcts.towc->stateful;
     }
   else if (*s == '\0')
     {