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=cd696e5936bfc27b6b89aa02efbd30028a76e2a2;hb=9c0d61ec236fb24ac2c1f5641630488546438459;hpb=2788a4851b551e1a3efb320a2878b809f2d8a9d7 diff --git a/src/iconv_encode_iso_8859_1.c b/src/iconv_encode_iso_8859_1.c index cd696e5..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-2009 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")) { @@ -266,7 +265,9 @@ yaz_iconv_decoder_t yaz_iso_8859_1_decoder(const char *fromcode, /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +