Fix misspellings in iconv/ and iconvdata/ -- BZ 25337

All the changes are in comments or '#error' messages.
Applying this commit results in bit-identical rebuild of iconvdata/*.so

Reviewed-by: Florian Weimer <fw@deneb.enyo.de>

diff --git a/iconv/gconv_charset.c b/iconv/gconv_charset.c
index 5696058298ee47aeb1c0c5390e2af16764196f84..0cf3226be63dc8e9ddeee16e985bb908e08ed94f 100644 (file)
--- a/iconv/gconv_charset.c
+++ b/iconv/gconv_charset.c
@@ -181,10 +181,10 @@ __gconv_create_spec (struct gconv_spec *conv_spec, const char *fromcode,
      implementation has always handled them.  Only suffixes in the tocode are
      processed and handled.  The reality is that invalid input in the input
      character set should only be ignored if the fromcode specifies IGNORE.
-     The current implementation ignores invalid intput in the input character
+     The current implementation ignores invalid input in the input character
      set if the tocode contains IGNORE.  We preserve this behavior for
      backwards compatibility.  In the future we may split the handling of
-     IGNORE to allow a finer grained specification of ignorning invalid input
+     IGNORE to allow a finer grained specification of ignoring invalid input
      and/or ignoring invalid output.  */
   conv_spec->translit = ptc.translit;
   conv_spec->ignore = ptc.ignore;

diff --git a/iconv/gconv_charset.h b/iconv/gconv_charset.h
index 00744aad56798c4b7255ed40733b54c30669a0ba..07815b0eee967f0d9144d9228f0c88dfb07230df 100644 (file)
--- a/iconv/gconv_charset.h
+++ b/iconv/gconv_charset.h
@@ -48,7 +48,7 @@
 
 
 /* This function copies in-order, characters from the source 's' that are
-   either alpha-numeric or one in one of these: "_-.,:/" - into the destination
+   either alphanumeric or one in one of these: "_-.,:/" - into the destination
    'wp' while dropping all other characters.  In the process, it converts all
    alphabetical characters to upper case.  It then appends up to two '/'
    characters so that the total number of '/'es in the destination is 2.  */

diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c
index c76011d6bc910c5c82ddb22ecdbabda0808bfd81..ee9e97e1bd3389d8393d729f5d80e7f900f96d10 100644 (file)
--- a/iconv/gconv_conf.c
+++ b/iconv/gconv_conf.c
@@ -153,7 +153,7 @@ static void
 add_alias (char *rp)
 {
   /* We now expect two more string.  The strings are normalized
-     (converted to UPPER case) and strored in the alias database.  */
+     (converted to UPPER case) and stored in the alias database.  */
   char *from, *to, *wp;
 
   while (__isspace_l (*rp, _nl_C_locobj_ptr))

diff --git a/iconv/gconv_int.h b/iconv/gconv_int.h
index 4b247a815f7be306a832f74b966e5d5708738680..19d042faff3c8a9998266865af324122491b48c7 100644 (file)
--- a/iconv/gconv_int.h
+++ b/iconv/gconv_int.h
@@ -172,7 +172,7 @@ __libc_lock_define (extern, __gconv_lock attribute_hidden)
   })
 
 
-/* Return in *HANDLE, a decriptor for the transformation.  The function expects
+/* Return in *HANDLE, a descriptor for the transformation.  The function expects
    the specification of the transformation in the structure pointed to by
    CONV_SPEC.  It only reads *CONV_SPEC and does not take ownership of it.  */
 extern int __gconv_open (struct gconv_spec *conv_spec,

diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c
index c60cffad4c6aabe688991460e3e86370b4d346e3..e936e171d77225593191923a8e01d7148974ef27 100644 (file)
--- a/iconv/gconv_simple.c
+++ b/iconv/gconv_simple.c
@@ -56,7 +56,7 @@ __gconv_btwoc_ascii (struct __gconv_step *step, unsigned char c)
 
 /* Transform from the internal, UCS4-like format, to UCS4.  The
    difference between the internal ucs4 format and the real UCS4
-   format is, if any, the endianess.  The Unicode/ISO 10646 says that
+   format is, if any, the endianness.  The Unicode/ISO 10646 says that
    unless some higher protocol specifies it differently, the byte
    order is big endian.*/
 #define DEFINE_INIT            0
@@ -100,7 +100,7 @@ internal_ucs4_loop (struct __gconv_step *step,
   *inptrp = inptr + n_convert * 4;
   *outptrp = __mempcpy (outptr, inptr, n_convert * 4);
 #else
-# error "This endianess is not supported."
+# error "This endianness is not supported."
 #endif
 
   /* Determine the status.  */
@@ -153,7 +153,7 @@ internal_ucs4_loop_single (struct __gconv_step *step,
   (*outptrp)[2] = state->__value.__wchb[2];
   (*outptrp)[3] = state->__value.__wchb[3];
 #else
-# error "This endianess is not supported."
+# error "This endianness is not supported."
 #endif
   *outptrp += 4;
 
@@ -347,7 +347,7 @@ internal_ucs4le_loop (struct __gconv_step *step,
   *inptrp = inptr + n_convert * 4;
   *outptrp = __mempcpy (outptr, inptr, n_convert * 4);
 #else
-# error "This endianess is not supported."
+# error "This endianness is not supported."
 #endif
 
   /* Determine the status.  */

diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index 1d90938d71fec593f81bfb7d3b4764ff717fea66..bee898c63c603da6132a50f30e34b87a32e1fc29 100644 (file)
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -537,7 +537,7 @@ incomplete character or shift sequence at end of buffer"));
 static int
 process_fd (iconv_t cd, int fd, FILE **output, const char *output_file)
 {
-  /* we have a problem with reading from a desriptor since we must not
+  /* we have a problem with reading from a descriptor since we must not
      provide the iconv() function an incomplete character or shift
      sequence at the end of the buffer.  Since we have to deal with
      arbitrary encodings we must read the whole text in a buffer and

diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c
index a319e2f7622a34ea4cf5482b0f4119b55a7e3789..f3f4baa4e75a3596a5a854b7e917fd097d9fec92 100644 (file)
--- a/iconv/iconvconfig.c
+++ b/iconv/iconvconfig.c
@@ -445,7 +445,7 @@ static void
 add_alias (char *rp)
 {
   /* We now expect two more string.  The strings are normalized
-     (converted to UPPER case) and strored in the alias database.  */
+     (converted to UPPER case) and stored in the alias database.  */
   char *from;
   char *to;
   char *wp;

diff --git a/iconvdata/bug-iconv8.c b/iconvdata/bug-iconv8.c
index e32d891b5ce1eb82a700432265d985dc6eea6841..1ebb674c91c454890acc18bd5ea1dd6c5812bf3d 100644 (file)
--- a/iconvdata/bug-iconv8.c
+++ b/iconvdata/bug-iconv8.c
@@ -29,7 +29,7 @@ do_test (void)
    /*
     * result: -1 84 0 0        (84=EILSEQ)
     *
-    * Error is returnd but inbuf is consumed.
+    * Error is returned but inbuf is consumed.
     *
     * \x83\xd9 is valid shift-jis sequence but no character is assigned
     * to it.

diff --git a/iconvdata/ibm1364.c b/iconvdata/ibm1364.c
index 4d6ec711390b4358b1867ac1bc58ea7cf524900e..5203f30e79ed07e94e8c0cdcafeb4ab4f1ad52cf 100644 (file)
--- a/iconvdata/ibm1364.c
+++ b/iconvdata/ibm1364.c
@@ -91,7 +91,7 @@
 
 
 /* Since we might have to reset input pointer we must be able to save
-   and retore the state.  */
+   and restore the state.  */
 #define SAVE_RESET_STATE(Save) \
   if (Save)                                                                  \
     save_curcs = *curcsp;                                                    \

diff --git a/iconvdata/ibm930.c b/iconvdata/ibm930.c
index 2939d4d29ec541b875ebd8a507860d7eb318b3d8..fe2fe1f15b777744e5afa5a189c52679117499d1 100644 (file)
--- a/iconvdata/ibm930.c
+++ b/iconvdata/ibm930.c
@@ -80,7 +80,7 @@
 
 
 /* Since we might have to reset input pointer we must be able to save
-   and retore the state.  */
+   and restore the state.  */
 #define SAVE_RESET_STATE(Save) \
   if (Save)                                                                  \
     save_curcs = *curcsp;                                                    \

diff --git a/iconvdata/ibm933.c b/iconvdata/ibm933.c
index 95935b8b36408abbdc0f532d048a3aa7f0ae82c0..4db0699a68ea1126b928aaf463e8105300180b87 100644 (file)
--- a/iconvdata/ibm933.c
+++ b/iconvdata/ibm933.c
@@ -79,7 +79,7 @@
 
 
 /* Since we might have to reset input pointer we must be able to save
-   and retore the state.  */
+   and restore the state.  */
 #define SAVE_RESET_STATE(Save) \
   if (Save)                                                                  \
     save_curcs = *curcsp;                                                    \

diff --git a/iconvdata/ibm935.c b/iconvdata/ibm935.c
index 1d8240a75843ba2ff112b10675bc6dd594ee05c2..3c3d697a2456eb25311bd020508859d87c77be7b 100644 (file)
--- a/iconvdata/ibm935.c
+++ b/iconvdata/ibm935.c
@@ -80,7 +80,7 @@
 
 
 /* Since we might have to reset input pointer we must be able to save
-   and retore the state.  */
+   and restore the state.  */
 #define SAVE_RESET_STATE(Save) \
   if (Save)                                                                  \
     save_curcs = *curcsp;                                                    \

diff --git a/iconvdata/ibm937.c b/iconvdata/ibm937.c
index 9e02aba122d7eb6b982b5c3129308e95c99098df..1586036c1e8727e1ca3c623500bf65cb4d2c22ea 100644 (file)
--- a/iconvdata/ibm937.c
+++ b/iconvdata/ibm937.c
@@ -80,7 +80,7 @@
 
 
 /* Since we might have to reset input pointer we must be able to save
-   and retore the state.  */
+   and restore the state.  */
 #define SAVE_RESET_STATE(Save) \
   if (Save)                                                                  \
     save_curcs = *curcsp;                                                    \

diff --git a/iconvdata/ibm939.c b/iconvdata/ibm939.c
index ce719cb29f69ac5086ecaadf16d6d868921b5005..9b053c696e52e75d00e1bb40faa14f495e4fade6 100644 (file)
--- a/iconvdata/ibm939.c
+++ b/iconvdata/ibm939.c
@@ -80,7 +80,7 @@
 
 
 /* Since we might have to reset input pointer we must be able to save
-   and retore the state.  */
+   and restore the state.  */
 #define SAVE_RESET_STATE(Save) \
   if (Save)                                                                  \
     save_curcs = *curcsp;                                                    \

diff --git a/iconvdata/iso-2022-cn-ext.c b/iconvdata/iso-2022-cn-ext.c
index d0c3ca4f0398d2f02fc7cde783bdebc02ec3517a..36727f0865da11acd6748e3a3722cc5d16735275 100644 (file)
--- a/iconvdata/iso-2022-cn-ext.c
+++ b/iconvdata/iso-2022-cn-ext.c
@@ -154,7 +154,7 @@ enum
 
 
 /* Since we might have to reset input pointer we must be able to save
-   and retore the state.  */
+   and restore the state.  */
 #define SAVE_RESET_STATE(Save) \
   if (Save)                                                                  \
     save_set = *setp;                                                        \

diff --git a/iconvdata/iso-2022-cn.c b/iconvdata/iso-2022-cn.c
index 73eb5e77c65516d4488c6c830aabcb157597efc5..5660ead668b57f83d70c46fe72f7124e99995af1 100644 (file)
--- a/iconvdata/iso-2022-cn.c
+++ b/iconvdata/iso-2022-cn.c
@@ -102,7 +102,7 @@ enum
 
 
 /* Since we might have to reset input pointer we must be able to save
-   and retore the state.  */
+   and restore the state.  */
 #define SAVE_RESET_STATE(Save) \
   if (Save)                                                                  \
     save_set = *setp;                                                        \

diff --git a/iconvdata/iso-2022-jp-3.c b/iconvdata/iso-2022-jp-3.c
index d341a14f5170bdecb6936a8d051424a9c546449f..c722bdbfc30a5aa39d4e9f79c1c7543165f7ccf0 100644 (file)
--- a/iconvdata/iso-2022-jp-3.c
+++ b/iconvdata/iso-2022-jp-3.c
@@ -156,7 +156,7 @@ enum
 
 
 /* Since we might have to reset input pointer we must be able to save
-   and retore the state.  */
+   and restore the state.  */
 #define SAVE_RESET_STATE(Save) \
   if (Save)                                                                  \
     saved_state = *statep;                                                   \

diff --git a/iconvdata/iso-2022-jp.c b/iconvdata/iso-2022-jp.c
index f31dfb92e6b406e1e71f77d22986e9ac15bd9d2f..b023d3cf8e84c495c0478d2e30c2086398fd264f 100644 (file)
--- a/iconvdata/iso-2022-jp.c
+++ b/iconvdata/iso-2022-jp.c
@@ -249,7 +249,7 @@ gconv_end (struct __gconv_step *data)
 
 
 /* Since we might have to reset input pointer we must be able to save
-   and retore the state.  */
+   and restore the state.  */
 #define SAVE_RESET_STATE(Save) \
   if (Save)                                                                  \
     save_set = *setp;                                                        \
@@ -679,7 +679,7 @@ static const cvlist_t conversion_lists[4] =
           the character is unknown.                                          \
           The CJK character sets partially overlap when seen as subsets      \
           of ISO 10646; therefore there is no single correct result.         \
-          We use a preferrence order which depends on the language tag.  */  \
+          We use a preference order which depends on the language tag.  */  \
                                                                              \
        if (ch <= 0x7f)                                                       \
          {                                                                   \

diff --git a/iconvdata/iso-2022-kr.c b/iconvdata/iso-2022-kr.c
index e71198aee99d0c67b7c370e0782670697dfa1c5e..fd785fd8f928d7a5723e133029077e857156e8d8 100644 (file)
--- a/iconvdata/iso-2022-kr.c
+++ b/iconvdata/iso-2022-kr.c
@@ -100,7 +100,7 @@ enum
 
 
 /* Since we might have to reset input pointer we must be able to save
-   and retore the state.  */
+   and restore the state.  */
 #define SAVE_RESET_STATE(Save) \
   if (Save)                                                                  \
     save_set = *setp;                                                        \

diff --git a/iconvdata/iso646.c b/iconvdata/iso646.c
index f7111a37591154eaacfe792845f9e1e8b7e29b31..1800dc8fdbf22acd1172b27717b93c966b79ab1c 100644 (file)
--- a/iconvdata/iso646.c
+++ b/iconvdata/iso646.c
@@ -21,7 +21,7 @@
    zillions of ISO 646 derivates and supporting them all in a separate
    module is overkill since these coded character sets are hardly ever
    used anymore (except ANSI_X3.4-1968 == ASCII, which is compatible
-   with ISO 8859-1).  The European variants are superceded by the
+   with ISO 8859-1).  The European variants are superseded by the
    various ISO 8859-? standards and the Asian variants are embedded in
    larger character sets.  Therefore this implementation is simply
    here to make it possible to do the conversion if it is necessary.

diff --git a/iconvdata/sjis.c b/iconvdata/sjis.c
index 93c28db13e5f854efd36d6dba5653ba3f57856f7..5ab821bbffd16de5a28908608d48593f32726420 100644 (file)
--- a/iconvdata/sjis.c
+++ b/iconvdata/sjis.c
@@ -2001,7 +2001,7 @@ static const char from_ucs4_greek[193][2] =
 
 
 /* The mapping of the Kanji is horrible.  The glyphs covered by Shift JIS
-   are spreaded all around the Unicode CJK area.  We use one big table
+   are spread all around the Unicode CJK area.  We use one big table
    since using the gaps will not buy us much.
 
    The following table can be generated using

diff --git a/iconvdata/tst-table.sh b/iconvdata/tst-table.sh
index d5b1f3c87d1c2a4373e9404bb33b8b818673352c..bc6f542b24f28f33339780150131442ac8c19cb0 100755 (executable)
--- a/iconvdata/tst-table.sh
+++ b/iconvdata/tst-table.sh
@@ -44,7 +44,7 @@ if test ${charset} = GB18030; then
   mv ${objpfx}tst-${charset}.truncated.table ${objpfx}tst-${charset}.charmap.table
 fi
 
-# Precomputed expexted differences between the charmap and iconv forward.
+# Precomputed expected differences between the charmap and iconv forward.
 precomposed=${charset}.precomposed
 
 # Precompute expected differences between the charmap and iconv backward.