X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxstriconveh.c;h=f7ae1a9002806191cb9b67fb59028959ffd28d6d;hb=fa1db0dd22768f09a507674a30beb5b8a87bb35f;hp=46f850c135ca3447c10039b05aec7fbdd777d2dc;hpb=0b8334787ce2366e410e7eca05501d3ad13de5d5;p=gnulib.git diff --git a/lib/xstriconveh.c b/lib/xstriconveh.c index 46f850c13..f7ae1a900 100644 --- a/lib/xstriconveh.c +++ b/lib/xstriconveh.c @@ -1,5 +1,5 @@ /* Charset conversion with out-of-memory checking. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 2009-2013 Free Software Foundation, Inc. Written by Bruno Haible. This program is free software: you can redistribute it and/or modify @@ -30,10 +30,10 @@ int xmem_cd_iconveh (const char *src, size_t srclen, - const iconveh_t *cd, - enum iconv_ilseq_handler handler, - size_t *offsets, - char **resultp, size_t *lengthp) + const iconveh_t *cd, + enum iconv_ilseq_handler handler, + size_t *offsets, + char **resultp, size_t *lengthp) { int retval = mem_cd_iconveh (src, srclen, cd, handler, offsets, resultp, lengthp); @@ -45,8 +45,8 @@ xmem_cd_iconveh (const char *src, size_t srclen, char * xstr_cd_iconveh (const char *src, - const iconveh_t *cd, - enum iconv_ilseq_handler handler) + const iconveh_t *cd, + enum iconv_ilseq_handler handler) { char *result = str_cd_iconveh (src, cd, handler); @@ -59,14 +59,14 @@ xstr_cd_iconveh (const char *src, int xmem_iconveh (const char *src, size_t srclen, - const char *from_codeset, const char *to_codeset, - enum iconv_ilseq_handler handler, - size_t *offsets, - char **resultp, size_t *lengthp) + const char *from_codeset, const char *to_codeset, + enum iconv_ilseq_handler handler, + size_t *offsets, + char **resultp, size_t *lengthp) { int retval = mem_iconveh (src, srclen, from_codeset, to_codeset, handler, offsets, - resultp, lengthp); + resultp, lengthp); if (retval < 0 && errno == ENOMEM) xalloc_die (); @@ -75,8 +75,8 @@ xmem_iconveh (const char *src, size_t srclen, char * xstr_iconveh (const char *src, - const char *from_codeset, const char *to_codeset, - enum iconv_ilseq_handler handler) + const char *from_codeset, const char *to_codeset, + enum iconv_ilseq_handler handler) { char *result = str_iconveh (src, from_codeset, to_codeset, handler);