mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-21 12:30:06 +00:00
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>
This commit is contained in:
parent
9a51f4e2b6
commit
f58a8c1c15
@ -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
|
implementation has always handled them. Only suffixes in the tocode are
|
||||||
processed and handled. The reality is that invalid input in the input
|
processed and handled. The reality is that invalid input in the input
|
||||||
character set should only be ignored if the fromcode specifies IGNORE.
|
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
|
set if the tocode contains IGNORE. We preserve this behavior for
|
||||||
backwards compatibility. In the future we may split the handling of
|
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. */
|
and/or ignoring invalid output. */
|
||||||
conv_spec->translit = ptc.translit;
|
conv_spec->translit = ptc.translit;
|
||||||
conv_spec->ignore = ptc.ignore;
|
conv_spec->ignore = ptc.ignore;
|
||||||
|
@ -48,7 +48,7 @@
|
|||||||
|
|
||||||
|
|
||||||
/* This function copies in-order, characters from the source 's' that are
|
/* 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
|
'wp' while dropping all other characters. In the process, it converts all
|
||||||
alphabetical characters to upper case. It then appends up to two '/'
|
alphabetical characters to upper case. It then appends up to two '/'
|
||||||
characters so that the total number of '/'es in the destination is 2. */
|
characters so that the total number of '/'es in the destination is 2. */
|
||||||
|
@ -153,7 +153,7 @@ static void
|
|||||||
add_alias (char *rp)
|
add_alias (char *rp)
|
||||||
{
|
{
|
||||||
/* We now expect two more string. The strings are normalized
|
/* 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;
|
char *from, *to, *wp;
|
||||||
|
|
||||||
while (__isspace_l (*rp, _nl_C_locobj_ptr))
|
while (__isspace_l (*rp, _nl_C_locobj_ptr))
|
||||||
|
@ -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
|
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. */
|
CONV_SPEC. It only reads *CONV_SPEC and does not take ownership of it. */
|
||||||
extern int __gconv_open (struct gconv_spec *conv_spec,
|
extern int __gconv_open (struct gconv_spec *conv_spec,
|
||||||
|
@ -56,7 +56,7 @@ __gconv_btwoc_ascii (struct __gconv_step *step, unsigned char c)
|
|||||||
|
|
||||||
/* Transform from the internal, UCS4-like format, to UCS4. The
|
/* Transform from the internal, UCS4-like format, to UCS4. The
|
||||||
difference between the internal ucs4 format and the real UCS4
|
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
|
unless some higher protocol specifies it differently, the byte
|
||||||
order is big endian.*/
|
order is big endian.*/
|
||||||
#define DEFINE_INIT 0
|
#define DEFINE_INIT 0
|
||||||
@ -100,7 +100,7 @@ internal_ucs4_loop (struct __gconv_step *step,
|
|||||||
*inptrp = inptr + n_convert * 4;
|
*inptrp = inptr + n_convert * 4;
|
||||||
*outptrp = __mempcpy (outptr, inptr, n_convert * 4);
|
*outptrp = __mempcpy (outptr, inptr, n_convert * 4);
|
||||||
#else
|
#else
|
||||||
# error "This endianess is not supported."
|
# error "This endianness is not supported."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Determine the status. */
|
/* Determine the status. */
|
||||||
@ -153,7 +153,7 @@ internal_ucs4_loop_single (struct __gconv_step *step,
|
|||||||
(*outptrp)[2] = state->__value.__wchb[2];
|
(*outptrp)[2] = state->__value.__wchb[2];
|
||||||
(*outptrp)[3] = state->__value.__wchb[3];
|
(*outptrp)[3] = state->__value.__wchb[3];
|
||||||
#else
|
#else
|
||||||
# error "This endianess is not supported."
|
# error "This endianness is not supported."
|
||||||
#endif
|
#endif
|
||||||
*outptrp += 4;
|
*outptrp += 4;
|
||||||
|
|
||||||
@ -347,7 +347,7 @@ internal_ucs4le_loop (struct __gconv_step *step,
|
|||||||
*inptrp = inptr + n_convert * 4;
|
*inptrp = inptr + n_convert * 4;
|
||||||
*outptrp = __mempcpy (outptr, inptr, n_convert * 4);
|
*outptrp = __mempcpy (outptr, inptr, n_convert * 4);
|
||||||
#else
|
#else
|
||||||
# error "This endianess is not supported."
|
# error "This endianness is not supported."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Determine the status. */
|
/* Determine the status. */
|
||||||
|
@ -537,7 +537,7 @@ incomplete character or shift sequence at end of buffer"));
|
|||||||
static int
|
static int
|
||||||
process_fd (iconv_t cd, int fd, FILE **output, const char *output_file)
|
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
|
provide the iconv() function an incomplete character or shift
|
||||||
sequence at the end of the buffer. Since we have to deal with
|
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
|
arbitrary encodings we must read the whole text in a buffer and
|
||||||
|
@ -445,7 +445,7 @@ static void
|
|||||||
add_alias (char *rp)
|
add_alias (char *rp)
|
||||||
{
|
{
|
||||||
/* We now expect two more string. The strings are normalized
|
/* 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 *from;
|
||||||
char *to;
|
char *to;
|
||||||
char *wp;
|
char *wp;
|
||||||
|
@ -29,7 +29,7 @@ do_test (void)
|
|||||||
/*
|
/*
|
||||||
* result: -1 84 0 0 (84=EILSEQ)
|
* 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
|
* \x83\xd9 is valid shift-jis sequence but no character is assigned
|
||||||
* to it.
|
* to it.
|
||||||
|
@ -91,7 +91,7 @@
|
|||||||
|
|
||||||
|
|
||||||
/* Since we might have to reset input pointer we must be able to save
|
/* 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) \
|
#define SAVE_RESET_STATE(Save) \
|
||||||
if (Save) \
|
if (Save) \
|
||||||
save_curcs = *curcsp; \
|
save_curcs = *curcsp; \
|
||||||
|
@ -80,7 +80,7 @@
|
|||||||
|
|
||||||
|
|
||||||
/* Since we might have to reset input pointer we must be able to save
|
/* 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) \
|
#define SAVE_RESET_STATE(Save) \
|
||||||
if (Save) \
|
if (Save) \
|
||||||
save_curcs = *curcsp; \
|
save_curcs = *curcsp; \
|
||||||
|
@ -79,7 +79,7 @@
|
|||||||
|
|
||||||
|
|
||||||
/* Since we might have to reset input pointer we must be able to save
|
/* 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) \
|
#define SAVE_RESET_STATE(Save) \
|
||||||
if (Save) \
|
if (Save) \
|
||||||
save_curcs = *curcsp; \
|
save_curcs = *curcsp; \
|
||||||
|
@ -80,7 +80,7 @@
|
|||||||
|
|
||||||
|
|
||||||
/* Since we might have to reset input pointer we must be able to save
|
/* 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) \
|
#define SAVE_RESET_STATE(Save) \
|
||||||
if (Save) \
|
if (Save) \
|
||||||
save_curcs = *curcsp; \
|
save_curcs = *curcsp; \
|
||||||
|
@ -80,7 +80,7 @@
|
|||||||
|
|
||||||
|
|
||||||
/* Since we might have to reset input pointer we must be able to save
|
/* 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) \
|
#define SAVE_RESET_STATE(Save) \
|
||||||
if (Save) \
|
if (Save) \
|
||||||
save_curcs = *curcsp; \
|
save_curcs = *curcsp; \
|
||||||
|
@ -80,7 +80,7 @@
|
|||||||
|
|
||||||
|
|
||||||
/* Since we might have to reset input pointer we must be able to save
|
/* 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) \
|
#define SAVE_RESET_STATE(Save) \
|
||||||
if (Save) \
|
if (Save) \
|
||||||
save_curcs = *curcsp; \
|
save_curcs = *curcsp; \
|
||||||
|
@ -154,7 +154,7 @@ enum
|
|||||||
|
|
||||||
|
|
||||||
/* Since we might have to reset input pointer we must be able to save
|
/* 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) \
|
#define SAVE_RESET_STATE(Save) \
|
||||||
if (Save) \
|
if (Save) \
|
||||||
save_set = *setp; \
|
save_set = *setp; \
|
||||||
|
@ -102,7 +102,7 @@ enum
|
|||||||
|
|
||||||
|
|
||||||
/* Since we might have to reset input pointer we must be able to save
|
/* 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) \
|
#define SAVE_RESET_STATE(Save) \
|
||||||
if (Save) \
|
if (Save) \
|
||||||
save_set = *setp; \
|
save_set = *setp; \
|
||||||
|
@ -156,7 +156,7 @@ enum
|
|||||||
|
|
||||||
|
|
||||||
/* Since we might have to reset input pointer we must be able to save
|
/* 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) \
|
#define SAVE_RESET_STATE(Save) \
|
||||||
if (Save) \
|
if (Save) \
|
||||||
saved_state = *statep; \
|
saved_state = *statep; \
|
||||||
|
@ -249,7 +249,7 @@ gconv_end (struct __gconv_step *data)
|
|||||||
|
|
||||||
|
|
||||||
/* Since we might have to reset input pointer we must be able to save
|
/* 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) \
|
#define SAVE_RESET_STATE(Save) \
|
||||||
if (Save) \
|
if (Save) \
|
||||||
save_set = *setp; \
|
save_set = *setp; \
|
||||||
@ -679,7 +679,7 @@ static const cvlist_t conversion_lists[4] =
|
|||||||
the character is unknown. \
|
the character is unknown. \
|
||||||
The CJK character sets partially overlap when seen as subsets \
|
The CJK character sets partially overlap when seen as subsets \
|
||||||
of ISO 10646; therefore there is no single correct result. \
|
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) \
|
if (ch <= 0x7f) \
|
||||||
{ \
|
{ \
|
||||||
|
@ -100,7 +100,7 @@ enum
|
|||||||
|
|
||||||
|
|
||||||
/* Since we might have to reset input pointer we must be able to save
|
/* 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) \
|
#define SAVE_RESET_STATE(Save) \
|
||||||
if (Save) \
|
if (Save) \
|
||||||
save_set = *setp; \
|
save_set = *setp; \
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
zillions of ISO 646 derivates and supporting them all in a separate
|
zillions of ISO 646 derivates and supporting them all in a separate
|
||||||
module is overkill since these coded character sets are hardly ever
|
module is overkill since these coded character sets are hardly ever
|
||||||
used anymore (except ANSI_X3.4-1968 == ASCII, which is compatible
|
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
|
various ISO 8859-? standards and the Asian variants are embedded in
|
||||||
larger character sets. Therefore this implementation is simply
|
larger character sets. Therefore this implementation is simply
|
||||||
here to make it possible to do the conversion if it is necessary.
|
here to make it possible to do the conversion if it is necessary.
|
||||||
|
@ -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
|
/* 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.
|
since using the gaps will not buy us much.
|
||||||
|
|
||||||
The following table can be generated using
|
The following table can be generated using
|
||||||
|
@ -44,7 +44,7 @@ if test ${charset} = GB18030; then
|
|||||||
mv ${objpfx}tst-${charset}.truncated.table ${objpfx}tst-${charset}.charmap.table
|
mv ${objpfx}tst-${charset}.truncated.table ${objpfx}tst-${charset}.charmap.table
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Precomputed expexted differences between the charmap and iconv forward.
|
# Precomputed expected differences between the charmap and iconv forward.
|
||||||
precomposed=${charset}.precomposed
|
precomposed=${charset}.precomposed
|
||||||
|
|
||||||
# Precompute expected differences between the charmap and iconv backward.
|
# Precompute expected differences between the charmap and iconv backward.
|
||||||
|
Loading…
Reference in New Issue
Block a user