projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gettimeofday: port recent C++ fix to Emacs
[gnulib.git]
/
lib
/
striconv.h
diff --git
a/lib/striconv.h
b/lib/striconv.h
index
dd75ade
..
0198211
100644
(file)
--- a/
lib/striconv.h
+++ b/
lib/striconv.h
@@
-1,5
+1,5
@@
/* Charset conversion.
/* Charset conversion.
- Copyright (C) 2001-2004, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2001-2004, 2006
-2007, 2009-2013
Free Software Foundation, Inc.
Written by Bruno Haible and Simon Josefsson.
This program is free software; you can redistribute it and/or modify
Written by Bruno Haible and Simon Josefsson.
This program is free software; you can redistribute it and/or modify
@@
-13,8
+13,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program; if not, see <http://www.gnu.org/licenses/>. */
#ifndef _STRICONV_H
#define _STRICONV_H
#ifndef _STRICONV_H
#define _STRICONV_H
@@
-35,14
+34,15
@@
extern "C" {
/* Convert an entire string from one encoding to another, using iconv.
The original string is at [SRC,...,SRC+SRCLEN-1].
The conversion descriptor is passed as CD.
/* Convert an entire string from one encoding to another, using iconv.
The original string is at [SRC,...,SRC+SRCLEN-1].
The conversion descriptor is passed as CD.
- *RESULTP
should initially contain NULL or a malloced memory block.
- May change the size of the allocated memory block in *RESULTP, storing
-
its new address in *RESULTP and its new length in *LENGTH
P.
+ *RESULTP
and *LENGTH should initially be a scratch buffer and its size,
+ or *RESULTP can initially be NULL.
+
May erase the contents of the memory at *RESULT
P.
Return value: 0 if successful, otherwise -1 and errno set.
Return value: 0 if successful, otherwise -1 and errno set.
- If successful, the resulting string is stored in *RESULTP and its length
- in *LENGTHP. */
+ If successful: The resulting string is stored in *RESULTP and its length
+ in *LENGTHP. *RESULTP is set to a freshly allocated memory block, or is
+ unchanged if no dynamic memory allocation was necessary. */
extern int mem_cd_iconv (const char *src, size_t srclen, iconv_t cd,
extern int mem_cd_iconv (const char *src, size_t srclen, iconv_t cd,
- char **resultp, size_t *lengthp);
+
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.
/* Convert an entire string from one encoding to another, using iconv.
The original string is the NUL-terminated string starting at SRC.
@@
-64,7
+64,7
@@
extern char * str_cd_iconv (const char *src, iconv_t cd);
Return value: the freshly allocated resulting NUL-terminated string if
successful, otherwise NULL and errno set. */
extern char * str_iconv (const char *src,
Return value: the freshly allocated resulting NUL-terminated string if
successful, otherwise NULL and errno set. */
extern char * str_iconv (const char *src,
- const char *from_codeset, const char *to_codeset);
+
const char *from_codeset, const char *to_codeset);
#ifdef __cplusplus
#ifdef __cplusplus