X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Ficonv_encode_iso_8859_1.c;h=2f198864f09931790c82e51b704978ad1bfb7356;hp=20b65057dd3920d2b9de391f41ef8d1c9b8ad225;hb=55b4bc7eb9295ce335fad273d08d82d62ce4b7ea;hpb=43a9d38d20c1b1bcd1a03b2445a501d27526bd35 diff --git a/src/iconv_encode_iso_8859_1.c b/src/iconv_encode_iso_8859_1.c index 20b6505..2f19886 100644 --- a/src/iconv_encode_iso_8859_1.c +++ b/src/iconv_encode_iso_8859_1.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2011 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ /** @@ -15,7 +15,6 @@ #include #include #include -#include #include #include "iconv-p.h" @@ -94,7 +93,7 @@ static struct { { 'y', 0x0301, 0xfd}, /* LATIN SMALL LETTER Y WITH ACUTE */ /* omitted: 0xfe LATIN SMALL LETTER THORN */ { 'y', 0x0308, 0xff}, /* LATIN SMALL LETTER Y WITH DIAERESIS */ - + { 0, 0, 0} }; @@ -159,7 +158,7 @@ static size_t write_iso_8859_1(yaz_iconv_t cd, yaz_iconv_encoder_t e, yaz_iconv_set_errno(cd, YAZ_ICONV_E2BIG); return (size_t)(-1); } - if (!latin1_comb[i].x1) + if (!latin1_comb[i].x1) { /* not found. Just write compose_char */ *outp++ = (unsigned char) w->compose_char; (*outbytesleft)--; @@ -224,7 +223,7 @@ void destroy_iso_8859_1(yaz_iconv_encoder_t e) yaz_iconv_encoder_t yaz_iso_8859_1_encoder(const char *tocode, yaz_iconv_encoder_t e) - + { if (!yaz_matchstr(tocode, "iso88591")) { @@ -240,7 +239,7 @@ yaz_iconv_encoder_t yaz_iso_8859_1_encoder(const char *tocode, return 0; } -static unsigned long read_ISO8859_1(yaz_iconv_t cd, +static unsigned long read_ISO8859_1(yaz_iconv_t cd, yaz_iconv_decoder_t d, unsigned char *inp, size_t inbytesleft, size_t *no_read) @@ -252,7 +251,7 @@ static unsigned long read_ISO8859_1(yaz_iconv_t cd, yaz_iconv_decoder_t yaz_iso_8859_1_decoder(const char *fromcode, yaz_iconv_decoder_t d) - + { if (!yaz_matchstr(fromcode, "iso88591")) {