projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'a39d4083cab589d7cd6a13e8a4b8db8875261d75'
[gnulib.git]
/
lib
/
striconveha.h
diff --git
a/lib/striconveha.h
b/lib/striconveha.h
index
9c4c676
..
e739585
100644
(file)
--- a/
lib/striconveha.h
+++ b/
lib/striconveha.h
@@
-1,11
+1,11
@@
/* Character set conversion with error handling and autodetection.
/* Character set conversion with error handling and autodetection.
- Copyright (C) 2002, 2005, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2005, 2007
-2014
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,15
+13,15
@@
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 _STRICONVEHA_H
#define _STRICONVEHA_H
#include <stdbool.h>
#ifndef _STRICONVEHA_H
#define _STRICONVEHA_H
#include <stdbool.h>
+#include <stddef.h>
-#include "
str
iconveh.h"
+#include "iconveh.h"
#ifdef __cplusplus
#ifdef __cplusplus
@@
-48,11
+48,11
@@
extern "C" {
unchanged if no dynamic memory allocation was necessary. */
extern int
mem_iconveha (const char *src, size_t srclen,
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.
/* 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,
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:
/* In the above, FROM_CODESET can also be one of the following values:
@@
-83,8
+83,8
@@
extern char *
Returns 0 upon success, or -1 (with errno set) in case of error.
Particular errno values: ENOMEM. */
extern int
Returns 0 upon success, or -1 (with errno set) in case of error.
Particular errno values: ENOMEM. */
extern int
- iconv_register_autodetect (const char *name,
- const char * const *try_in_order);
+
un
iconv_register_autodetect (const char *name,
+
const char * const *try_in_order);
#ifdef __cplusplus
#ifdef __cplusplus