X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstriconveha.h;h=6f28e51f5f179c548108b1dda8eb82e7cec0f27c;hb=679b14d8851a364efdffbdf50d4aa43921762076;hp=28fc7e6b13a74d404220fb625796d8ffb797d551;hpb=36a6f6825953d52a32710a6c38d3ef3a5870d3ac;p=gnulib.git
diff --git a/lib/striconveha.h b/lib/striconveha.h
index 28fc7e6b1..6f28e51f5 100644
--- a/lib/striconveha.h
+++ b/lib/striconveha.h
@@ -2,10 +2,10 @@
Copyright (C) 2002, 2005, 2007 Free Software Foundation, Inc.
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
- 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
@@ -13,12 +13,13 @@
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 . */
#ifndef _STRICONVEHA_H
#define _STRICONVEHA_H
+#include
+
#include "striconveh.h"
@@ -30,6 +31,13 @@ extern "C" {
/* Convert an entire string from one encoding to another, using iconv.
The original string is at [SRC,...,SRC+SRCLEN-1].
The "from" encoding can also be a name defined for autodetection.
+ If TRANSLITERATE is true, transliteration will attempted to avoid conversion
+ errors, for iconv implementations that support this. Usually you'll choose
+ TRANSLITERATE = true if HANDLER != iconveh_error.
+ If OFFSETS is not NULL, it should point to an array of SRCLEN integers; this
+ array is filled with offsets into the result, i.e. the character starting
+ at SRC[i] corresponds to the character starting at (*RESULTP)[OFFSETS[i]],
+ and other offsets are set to (size_t)(-1).
*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 *RESULTP.
@@ -40,7 +48,9 @@ extern "C" {
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);
/* Convert an entire string from one encoding to another, using iconv.
@@ -48,12 +58,16 @@ extern int
Both the "from" and the "to" encoding must use a single NUL byte at the
end of the string (i.e. not UCS-2, UCS-4, UTF-16, UTF-32).
The "from" encoding can also be a name defined for autodetection.
+ If TRANSLITERATE is true, transliteration will attempted to avoid conversion
+ errors, for iconv implementations that support this. Usually you'll choose
+ TRANSLITERATE = true if HANDLER != iconveh_error.
Allocate a malloced memory block for the result.
Return value: the freshly allocated resulting NUL-terminated string if
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);