X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fstriconveha.h;h=6e87056022ead20cdea2786b87ce132df52deb7a;hb=571f20db52d2165d6cce4b2aacdedb123330d90f;hp=28fc7e6b13a74d404220fb625796d8ffb797d551;hpb=36a6f6825953d52a32710a6c38d3ef3a5870d3ac;p=gnulib.git

diff --git a/lib/striconveha.h b/lib/striconveha.h
index 28fc7e6b1..6e8705602 100644
--- a/lib/striconveha.h
+++ b/lib/striconveha.h
@@ -1,11 +1,11 @@
 /* Character set conversion with error handling and autodetection.
-   Copyright (C) 2002, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2007-2013 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,13 +13,15 @@
    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 "striconveh.h"
+#include <stdbool.h>
+#include <stddef.h>
+
+#include "iconveh.h"
 
 
 #ifdef __cplusplus
@@ -30,6 +32,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.
@@ -39,22 +48,28 @@ extern "C" {
    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,
-		     enum iconv_ilseq_handler handler,
-		     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.
    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,
-		     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:
@@ -68,8 +83,8 @@ extern char *
    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);
+       uniconv_register_autodetect (const char *name,
+                                    const char * const *try_in_order);
 
 
 #ifdef __cplusplus