diff options
Diffstat (limited to 'src/charset/codecs/codec_8859.c')
| -rw-r--r-- | src/charset/codecs/codec_8859.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/charset/codecs/codec_8859.c b/src/charset/codecs/codec_8859.c index c04eb87..b76a2c7 100644 --- a/src/charset/codecs/codec_8859.c +++ b/src/charset/codecs/codec_8859.c @@ -101,11 +101,12 @@ static inline parserutils_error charset_8859_to_ucs4(charset_8859_codec *c, */ bool charset_8859_codec_handles_charset(const char *charset) { + uint32_t i; uint16_t match = parserutils_charset_mibenum_from_name(charset, strlen(charset)); if (known_charsets[0].mib == 0) { - for (uint32_t i = 0; i < N_ELEMENTS(known_charsets); i++) { + for (i = 0; i < N_ELEMENTS(known_charsets); i++) { known_charsets[i].mib = parserutils_charset_mibenum_from_name( known_charsets[i].name, @@ -113,7 +114,7 @@ bool charset_8859_codec_handles_charset(const char *charset) } } - for (uint32_t i = 0; i < N_ELEMENTS(known_charsets); i++) { + for (i = 0; i < N_ELEMENTS(known_charsets); i++) { if (known_charsets[i].mib == match) return true; } @@ -136,12 +137,13 @@ parserutils_error charset_8859_codec_create(const char *charset, parserutils_alloc alloc, void *pw, parserutils_charset_codec **codec) { + uint32_t i; charset_8859_codec *c; uint16_t match = parserutils_charset_mibenum_from_name( charset, strlen(charset)); uint32_t *table = NULL; - for (uint32_t i = 0; i < N_ELEMENTS(known_charsets); i++) { + for (i = 0; i < N_ELEMENTS(known_charsets); i++) { if (known_charsets[i].mib == match) { table = known_charsets[i].table; break; @@ -231,9 +233,10 @@ parserutils_error charset_8859_codec_encode(parserutils_charset_codec *codec, error = charset_8859_from_ucs4(c, pwrite[0], dest, destlen); if (error != PARSERUTILS_OK) { + uint32_t len; assert(error == PARSERUTILS_NOMEM); - for (uint32_t len = 0; + for (len = 0; len < c->write_len; len++) { c->write_buf[len] = pwrite[len]; } @@ -257,6 +260,7 @@ parserutils_error charset_8859_codec_encode(parserutils_charset_codec *codec, error = charset_8859_from_ucs4(c, towrite[0], dest, destlen); if (error != PARSERUTILS_OK) { + uint32_t len; if (error != PARSERUTILS_NOMEM) { return error; } @@ -269,7 +273,7 @@ parserutils_error charset_8859_codec_encode(parserutils_charset_codec *codec, /* Copy pending chars to save area, for * processing next call. */ - for (uint32_t len = 0; len < towritelen; len++) + for (len = 0; len < towritelen; len++) c->write_buf[len] = towrite[len]; /* Claim character we've just buffered, |