aboutsummaryrefslogtreecommitdiff
path: root/iconv/gconv_int.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-06-19 21:12:06 +0000
committerUlrich Drepper <drepper@redhat.com>2000-06-19 21:12:06 +0000
commitd620426811688301eb1cbe6e63773d6430b2706e (patch)
tree555eb9182298ec1e56db8a5de4f62daa2e654321 /iconv/gconv_int.h
parent01da56ba764e6abc52bfe9a1feeb79d3d67346d1 (diff)
downloadglibc-d620426811688301eb1cbe6e63773d6430b2706e.zip
glibc-d620426811688301eb1cbe6e63773d6430b2706e.tar.gz
glibc-d620426811688301eb1cbe6e63773d6430b2706e.tar.bz2
Update.
2000-06-19 Ulrich Drepper <drepper@redhat.com> * iconv/gconv.h (__gconv_trans_fct): Add new parameter. General namespace cleanup. (struct __gconv_trans_data): Add next field. (struct __gconv_step_data): Make __trans a pointer. * iconv/gconv_conf.c: Split out code to find gconv directories from __gconv_read_conf in new functions. * iconv/gconv_int.h: Define new data structure and declare new functions for handling of gconv directory list. * iconv/gconv_open.c: Allow more than one error handling step being used. Call function to load error handling module if it is none of the builtin transformations. * iconv/gconv_close.c: Add code to free transliteration data. * iconv/gconv_trans.c: Add functions to load and unload modules implementing transliteration etc. * iconv/skeleton.c: Call all context functions now that more than one module is allowed. * iconv/loop.c (STANDARD_ERR_HANDLING): New macro. * iconv/gconv_simple.c: Use STANDARD_ERR_HANDLING macro for places where the full error handling using transliteration is needed. * iconvdata/8bit-gap.c: Likewise. * iconvdata/8bit-generic.c: Likewise. * iconvdata/ansi_x3.110.c: Likewise. * iconvdata/big5.c: Likewise. * iconvdata/big5hkscs.c: Likewise. * iconvdata/euc-cn.c: Likewise. * iconvdata/euc-jp.c: Likewise. * iconvdata/euc-kr.c: Likewise. * iconvdata/euc-tw.c: Likewise. * iconvdata/gbgbk.c: Likewise. * iconvdata/gbk.c: Likewise. * iconvdata/iso-2022-cn.c: Likewise. * iconvdata/iso-2022-jp.c: Likewise. * iconvdata/iso-2022-kr.c: Likewise. * iconvdata/iso646.c: Likewise. * iconvdata/iso8859-1.c: Likewise. * iconvdata/iso_6937-2.c: Likewise. * iconvdata/iso_6937.c: Likewise. * iconvdata/johab.c: Likewise. * iconvdata/sjis.c: Likewise. * iconvdata/t.61.c: Likewise. * iconvdata/uhc.c: Likewise. * iconvdata/unicode.c: Likewise. * iconvdata/utf-16.c: Likewise. * libio/iofwide.c: Reset __trans member of __gconv_trans_data structure correctly after last change. * wcsmbs/btowc.c: Likewise. * wcsmbs/mbrtowc.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wcrtomb.c: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wctob.c: Likewise. * localedata/Makefile: Set -Wno-format for some files since gcc does not know all the format specifiers. 2000-06-18 Ulrich Drepper <drepper@redhat.com> * locale/loadlocale.c (_nl_unload_locale): Remove a bit of unneeded code. * locale/lc-time.c (_nl_init_era_entries): Likewise.
Diffstat (limited to 'iconv/gconv_int.h')
-rw-r--r--iconv/gconv_int.h36
1 files changed, 36 insertions, 0 deletions
diff --git a/iconv/gconv_int.h b/iconv/gconv_int.h
index 5bdf714..6d19971 100644
--- a/iconv/gconv_int.h
+++ b/iconv/gconv_int.h
@@ -26,6 +26,19 @@
__BEGIN_DECLS
+/* Type to represent search path. */
+struct path_elem
+{
+ const char *name;
+ size_t len;
+};
+
+/* Variable with search path for `gconv' implementation. */
+extern const struct path_elem *__gconv_path_elem;
+/* Maximum length of a single path element. */
+extern size_t __gconv_max_path_elem_len;
+
+
/* Structure for alias definition. Simply to strings. */
struct gconv_alias
{
@@ -83,6 +96,21 @@ struct gconv_module
};
+/* Internal data structure to represent transliteration module. */
+struct trans_struct
+{
+ const char *name;
+ struct trans_struct *next;
+
+ const char **csnames;
+ size_t ncsnames;
+ __gconv_trans_fct trans_fct;
+ __gconv_trans_context_fct trans_context_fct;
+ __gconv_trans_init_fct trans_init_fct;
+ __gconv_trans_end_fct trans_end_fct;
+};
+
+
/* Flags for `gconv_open'. */
enum
{
@@ -161,6 +189,9 @@ extern int __gconv_find_transform (const char *toset, const char *fromset,
/* Read all the configuration data and cache it. */
extern void __gconv_read_conf (void);
+/* Determine the directories we are looking in. */
+extern void __gconv_get_path (void);
+
/* Comparison function to search alias. */
extern int __gconv_alias_compare (const void *p1, const void *p2);
@@ -185,9 +216,14 @@ extern void __gconv_get_builtin_trans (const char *name,
struct __gconv_step *step)
internal_function;
+/* Try to load transliteration step module. */
+extern int __gconv_translit_find (struct trans_struct *trans)
+ internal_function;
+
/* Transliteration using the locale's data. */
extern int __gconv_transliterate (struct __gconv_step *step,
struct __gconv_step_data *step_data,
+ void *trans_data,
__const unsigned char *inbufstart,
__const unsigned char **inbufp,
__const unsigned char *inbufend,