diff options
| author | Andreas Rottmann <a.rottmann@gmx.at> | 2010-05-27 18:23:17 +0200 |
|---|---|---|
| committer | Andreas Rottmann <a.rottmann@gmx.at> | 2010-05-27 18:23:17 +0200 |
| commit | bd6adfa17d453e4c486e36fed4c5779db90a8a0e (patch) | |
| tree | 9798677560d5f99061afe9f0db105a8c97f2438a /lib/striconveha.h | |
| parent | 79ca645d222db2e158784642c3b464a47bea26f3 (diff) | |
| parent | 3e0814cd9862b89c7a39672672937477bd87ddfb (diff) | |
Merge commit 'upstream/0.9.3'
Diffstat (limited to 'lib/striconveha.h')
| -rw-r--r-- | lib/striconveha.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/striconveha.h b/lib/striconveha.h index c88eb52f..5f106c32 100644 --- a/lib/striconveha.h +++ b/lib/striconveha.h @@ -1,5 +1,5 @@ /* Character set conversion with error handling and autodetection. - Copyright (C) 2002, 2005, 2007-2009 Free Software Foundation, Inc. + Copyright (C) 2002, 2005, 2007-2010 Free Software Foundation, Inc. Written by Bruno Haible. This program is free software: you can redistribute it and/or modify @@ -48,11 +48,11 @@ extern "C" { unchanged if no dynamic memory allocation was necessary. */ extern int mem_iconveha (const char *src, size_t srclen, - const char *from_codeset, const char *to_codeset, - bool transliterate, - enum iconv_ilseq_handler handler, - size_t *offsets, - char **resultp, size_t *lengthp); + const char *from_codeset, const char *to_codeset, + bool transliterate, + 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,9 +67,9 @@ extern int successful, otherwise NULL and errno set. */ extern char * str_iconveha (const char *src, - const char *from_codeset, const char *to_codeset, - bool transliterate, - enum iconv_ilseq_handler handler); + const char *from_codeset, const char *to_codeset, + bool transliterate, + enum iconv_ilseq_handler handler); /* In the above, FROM_CODESET can also be one of the following values: @@ -84,7 +84,7 @@ extern char * Particular errno values: ENOMEM. */ extern int uniconv_register_autodetect (const char *name, - const char * const *try_in_order); + const char * const *try_in_order); #ifdef __cplusplus |