X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Ficonv_decode_danmarc.c;h=cf9e50c45810ff4c15e4cbec1e2e1745c75d167e;hp=7e86c0d591c2706e5797bd4fc1b0130e75fe30d7;hb=0b121738c22cd67b153792d645746447d8a81767;hpb=43a9d38d20c1b1bcd1a03b2445a501d27526bd35 diff --git a/src/iconv_decode_danmarc.c b/src/iconv_decode_danmarc.c index 7e86c0d..cf9e50c 100644 --- a/src/iconv_decode_danmarc.c +++ b/src/iconv_decode_danmarc.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 #include @@ -25,7 +24,7 @@ struct decoder_data { unsigned long x_back; }; -static unsigned long read_danmarc(yaz_iconv_t cd, +static unsigned long read_danmarc(yaz_iconv_t cd, yaz_iconv_decoder_t d, unsigned char *inp, size_t inbytesleft, size_t *no_read) @@ -58,14 +57,12 @@ static unsigned long read_danmarc(yaz_iconv_t cd, *no_read = 2; break; case 0xe5: /* LATIN SMALL LETTER A WITH RING ABOVE */ - x = 'a'; - data->x_back = 'a'; - *no_read = 1; + x = 0xa733; + *no_read = 2; break; case 0xc5: /* LATIN CAPITAL LETTER A WITH RING ABOVE */ - x = 'A'; - data->x_back = 'a'; - *no_read = 1; + x = 0xa732; + *no_read = 2; break; default: if (inbytesleft < 5) @@ -106,7 +103,7 @@ void destroy_danmarc(yaz_iconv_decoder_t d) yaz_iconv_decoder_t yaz_danmarc_decoder(const char *fromcode, yaz_iconv_decoder_t d) - + { if (!yaz_matchstr(fromcode, "danmarc")) {