Update.

[thirdparty/glibc.git] / iconv / gconv_int.h

diff --git a/iconv/gconv_int.h b/iconv/gconv_int.h
index ae6be36b5e1ea3fb468c1a6edd301086471db8ed..a5fb7284475d76aad4224e75d7cfccd32d9ca52e 100644 (file)
--- a/iconv/gconv_int.h
+++ b/iconv/gconv_int.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997,1998,1999,2000,2001,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -21,6 +21,7 @@
 #define _GCONV_INT_H   1
 
 #include "gconv.h"
+#include <stdlib.h>            /* For alloca used in macro below.  */
 
 __BEGIN_DECLS
 
@@ -114,11 +115,11 @@ enum
 /* Global variables.  */
 
 /* Database of alias names.  */
-extern void *__gconv_alias_db;
+extern void *__gconv_alias_db attribute_hidden;
 
 /* Array with available modules.  */
 extern size_t __gconv_nmodules;
-extern struct gconv_module *__gconv_modules_db;
+extern struct gconv_module *__gconv_modules_db attribute_hidden;
 
 /* Value of the GCONV_PATH environment variable.  */
 extern const char *__gconv_path_envvar attribute_hidden;
@@ -138,7 +139,7 @@ extern const char *__gconv_path_envvar attribute_hidden;
       if (*cp++ == '/')                                                              \
        ++cnt;                                                                \
                                                                              \
-    tmp = result = alloca (cp - (str) + 3 + suffix_len);                     \
+    tmp = result = __alloca (cp - (str) + 3 + suffix_len);                   \
     cp = (str);                                                                      \
     while (*cp != '\0')                                                              \
       *tmp++ = __toupper_l (*cp++, &_nl_C_locobj);                           \
@@ -199,16 +200,26 @@ extern void __gconv_release_step (struct __gconv_step *step)
      internal_function;
 
 /* Read all the configuration data and cache it.  */
-extern void __gconv_read_conf (void);
+extern void __gconv_read_conf (void) attribute_hidden;
 
 /* Try to read module cache file.  */
 extern int __gconv_load_cache (void) internal_function;
 
+/* Retrieve pointer to internal cache.  */
+extern void *__gconv_get_cache (void);
+
+/* Retrieve pointer to internal module database.  */
+extern struct gconv_module *__gconv_get_modules_db (void);
+
+/* Retrieve pointer to internal alias database.  */
+extern void *__gconv_get_alias_db (void);
+
 /* Determine the directories we are looking in.  */
-extern void __gconv_get_path (void);
+extern void __gconv_get_path (void) internal_function;
 
 /* Comparison function to search alias.  */
-extern int __gconv_alias_compare (const void *p1, const void *p2);
+extern int __gconv_alias_compare (const void *p1, const void *p2)
+     attribute_hidden;
 
 /* Clear reference to transformation step implementations which might
    cause the code to be unloaded.  */
@@ -248,12 +259,17 @@ extern int __gconv_transliterate (struct __gconv_step *step,
                                  __const unsigned char **inbufp,
                                  __const unsigned char *inbufend,
                                  unsigned char **outbufstart,
-                                 size_t *irreversible);
+                                 size_t *irreversible) attribute_hidden;
+
+
+/* If NAME is an codeset alias expand it.  */
+extern int __gconv_compare_alias (const char *name1, const char *name2)
+     internal_function;
 
 
 /* Builtin transformations.  */
 #ifdef _LIBC
-# define __BUILTIN_TRANS(Name) \
+# define __BUILTIN_TRANSFORM(Name) \
   extern int Name (struct __gconv_step *step,                                \
                   struct __gconv_step_data *data,                            \
                   const unsigned char **inbuf,                               \
@@ -261,21 +277,25 @@ extern int __gconv_transliterate (struct __gconv_step *step,
                   unsigned char **outbufstart, size_t *irreversible,         \
                   int do_flush, int consume_incomplete)
 
-__BUILTIN_TRANS (__gconv_transform_ascii_internal);
-__BUILTIN_TRANS (__gconv_transform_internal_ascii);
-__BUILTIN_TRANS (__gconv_transform_utf8_internal);
-__BUILTIN_TRANS (__gconv_transform_internal_utf8);
-__BUILTIN_TRANS (__gconv_transform_ucs2_internal);
-__BUILTIN_TRANS (__gconv_transform_internal_ucs2);
-__BUILTIN_TRANS (__gconv_transform_ucs2reverse_internal);
-__BUILTIN_TRANS (__gconv_transform_internal_ucs2reverse);
-__BUILTIN_TRANS (__gconv_transform_internal_ucs4);
-__BUILTIN_TRANS (__gconv_transform_ucs4_internal);
-__BUILTIN_TRANS (__gconv_transform_internal_ucs4le);
-__BUILTIN_TRANS (__gconv_transform_ucs4le_internal);
-__BUILTIN_TRANS (__gconv_transform_internal_utf16);
-__BUILTIN_TRANS (__gconv_transform_utf16_internal);
-# undef __BUITLIN_TRANS
+__BUILTIN_TRANSFORM (__gconv_transform_ascii_internal);
+__BUILTIN_TRANSFORM (__gconv_transform_internal_ascii);
+__BUILTIN_TRANSFORM (__gconv_transform_utf8_internal);
+__BUILTIN_TRANSFORM (__gconv_transform_internal_utf8);
+__BUILTIN_TRANSFORM (__gconv_transform_ucs2_internal);
+__BUILTIN_TRANSFORM (__gconv_transform_internal_ucs2);
+__BUILTIN_TRANSFORM (__gconv_transform_ucs2reverse_internal);
+__BUILTIN_TRANSFORM (__gconv_transform_internal_ucs2reverse);
+__BUILTIN_TRANSFORM (__gconv_transform_internal_ucs4);
+__BUILTIN_TRANSFORM (__gconv_transform_ucs4_internal);
+__BUILTIN_TRANSFORM (__gconv_transform_internal_ucs4le);
+__BUILTIN_TRANSFORM (__gconv_transform_ucs4le_internal);
+__BUILTIN_TRANSFORM (__gconv_transform_internal_utf16);
+__BUILTIN_TRANSFORM (__gconv_transform_utf16_internal);
+# undef __BUITLIN_TRANSFORM
+
+/* Specialized conversion function for a single byte to INTERNAL, recognizing
+   only ASCII characters.  */
+extern wint_t __gconv_btwoc_ascii (struct __gconv_step *step, unsigned char c);
 
 #endif