X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fxstriconveh.h;h=65781c4c22f4b4da83b1fc4afef7c405d4da2413;hb=6951841b81058b0dd883fcdeb2be31d6aa8b8658;hp=e4b0bf87886fa41fb567b9469267b7aa9d196d91;hpb=0b8334787ce2366e410e7eca05501d3ad13de5d5;p=pspp diff --git a/lib/xstriconveh.h b/lib/xstriconveh.h index e4b0bf8788..65781c4c22 100644 --- a/lib/xstriconveh.h +++ b/lib/xstriconveh.h @@ -1,5 +1,5 @@ /* Charset conversion with out-of-memory checking. - Copyright (C) 2001-2007, 2009 Free Software Foundation, Inc. + Copyright (C) 2001-2007, 2009-2011 Free Software Foundation, Inc. Written by Bruno Haible and Simon Josefsson. This program is free software: you can redistribute it and/or modify @@ -50,10 +50,10 @@ extern "C" { unchanged if no dynamic memory allocation was necessary. */ extern 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); /* Convert an entire string from one encoding to another, using iconv. The original string is the NUL-terminated string starting at SRC. @@ -67,8 +67,8 @@ extern int successful, otherwise NULL and errno set. */ extern 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); #endif @@ -88,10 +88,10 @@ extern char * unchanged if no dynamic memory allocation was necessary. */ extern 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); /* Convert an entire string from one encoding to another, using iconv. The original string is the NUL-terminated string starting at SRC. @@ -103,8 +103,8 @@ extern int successful, otherwise NULL and errno set. */ extern 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); #ifdef __cplusplus