X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fsiconv.c;h=42220e2cb67b2324eee368bc3e217c448e5a7b59;hp=596fe25daaa81d0d2086431453c9efc4fb705afd;hb=c753bab9ac07a09f1bd7ba1dc363e58310e307a7;hpb=0c46d2e66bdeea1600e700124a81a5d0a65d349e diff --git a/src/siconv.c b/src/siconv.c index 596fe25..42220e2 100644 --- a/src/siconv.c +++ b/src/siconv.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2013 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ /** @@ -32,12 +32,6 @@ struct yaz_iconv_struct { int my_errno; int init_flag; -#if 0 - size_t (*init_handle)(yaz_iconv_t cd, unsigned char *inbuf, - size_t inbytesleft, size_t *no_read); - unsigned long (*read_handle)(yaz_iconv_t cd, unsigned char *inbuf, - size_t inbytesleft, size_t *no_read); -#endif size_t no_read_x; unsigned long unget_x; #if HAVE_ICONV_H @@ -70,6 +64,8 @@ static int prepare_encoders(yaz_iconv_t cd, const char *tocode) return 1; if (yaz_wchar_encoder(tocode, &cd->encoder)) return 1; + if (yaz_danmarc_encoder(tocode, &cd->encoder)) + return 1; return 0; }