X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fsiconv.c;h=596fe25daaa81d0d2086431453c9efc4fb705afd;hp=7895db28f17a2f51fff0053e61929b6bbb3389a7;hb=d2ed898832ae354c17254ff52c70c92278518efe;hpb=2715f6522ca62ab5dbc886c21ed18945743216f0 diff --git a/src/siconv.c b/src/siconv.c index 7895db2..596fe25 100644 --- a/src/siconv.c +++ b/src/siconv.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2011 Index Data + * Copyright (C) 1995-2013 Index Data * See the file LICENSE for details. */ /** @@ -185,10 +185,10 @@ size_t yaz_iconv(yaz_iconv_t cd, char **inbuf, size_t *inbytesleft, if (cd->init_flag) { cd->my_errno = YAZ_ICONV_UNKNOWN; - + if (cd->encoder.init_handle) (*cd->encoder.init_handle)(&cd->encoder); - + cd->unget_x = 0; cd->no_read_x = 0; @@ -198,7 +198,7 @@ size_t yaz_iconv(yaz_iconv_t cd, char **inbuf, size_t *inbytesleft, size_t r = (cd->decoder.init_handle)( cd, &cd->decoder, inbuf ? (unsigned char *) *inbuf : 0, - inbytesleft ? *inbytesleft : 0, + inbytesleft ? *inbytesleft : 0, &no_read); if (r) { @@ -249,7 +249,7 @@ size_t yaz_iconv(yaz_iconv_t cd, char **inbuf, size_t *inbytesleft, break; } x = (*cd->decoder.read_handle)( - cd, &cd->decoder, + cd, &cd->decoder, (unsigned char *) *inbuf, *inbytesleft, &no_read); if (no_read == 0) {