projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exit: Obsolete module, use stdlib instead.
[gnulib.git]
/
lib
/
xstriconv.c
diff --git
a/lib/xstriconv.c
b/lib/xstriconv.c
index
5657eda
..
7c8c142
100644
(file)
--- a/
lib/xstriconv.c
+++ b/
lib/xstriconv.c
@@
-1,11
+1,11
@@
/* Charset conversion with out-of-memory checking.
/* Charset conversion with out-of-memory checking.
- Copyright (C) 2001-2004, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2001-2004, 2006
, 2009-2010
Free Software Foundation, Inc.
Written by Bruno Haible.
Written by Bruno Haible.
- 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,12
+13,9
@@
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/>. */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
/* Specification. */
#include "xstriconv.h"
/* Specification. */
#include "xstriconv.h"
@@
-33,7
+30,7
@@
int
xmem_cd_iconv (const char *src, size_t srclen, iconv_t cd,
int
xmem_cd_iconv (const char *src, size_t srclen, iconv_t cd,
- char **resultp, size_t *lengthp)
+
char **resultp, size_t *lengthp)
{
int retval = mem_cd_iconv (src, srclen, cd, resultp, lengthp);
{
int retval = mem_cd_iconv (src, srclen, cd, resultp, lengthp);