projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
open: Remove call-in from fchdir.m4.
[gnulib.git]
/
lib
/
xstriconv.h
diff --git
a/lib/xstriconv.h
b/lib/xstriconv.h
index
0d42758
..
eba6b16
100644
(file)
--- a/
lib/xstriconv.h
+++ b/
lib/xstriconv.h
@@
-1,11
+1,11
@@
/* Charset conversion with out-of-memory checking.
/* Charset conversion with out-of-memory checking.
- Copyright (C) 2001-2004, 2006-2007 Free Software Foundation, Inc.
+ Copyright (C) 2001-2004, 2006-2007
, 2009-2011
Free Software Foundation, Inc.
Written by Bruno Haible and Simon Josefsson.
Written by Bruno Haible and Simon Josefsson.
- This program is free software
;
you can redistribute it and/or modify
+ This program is free software
:
you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-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 _XSTRICONV_H
#define _XSTRICONV_H
#ifndef _XSTRICONV_H
#define _XSTRICONV_H
@@
-44,7
+43,7
@@
extern "C" {
in *LENGTHP. *RESULTP is set to a freshly allocated memory block, or is
unchanged if no dynamic memory allocation was necessary. */
extern int xmem_cd_iconv (const char *src, size_t srclen, iconv_t cd,
in *LENGTHP. *RESULTP is set to a freshly allocated memory block, or is
unchanged if no dynamic memory allocation was necessary. */
extern int xmem_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.
@@
-68,7
+67,7
@@
extern char * xstr_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 * xstr_iconv (const char *src,
Return value: the freshly allocated resulting NUL-terminated string if
successful, otherwise NULL and errno set. */
extern char * xstr_iconv (const char *src,
- const char *from_codeset, const char *to_codeset);
+
const char *from_codeset, const char *to_codeset);
#ifdef __cplusplus
#ifdef __cplusplus