about summary refs log tree commit diff
path: root/iconv/gconv.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-04-03 15:46:53 +0000
committerUlrich Drepper <drepper@redhat.com>1998-04-03 15:46:53 +0000
commite62c19f12cfc377ac9ce7c037713ead5dc6b57d9 (patch)
tree95fc8aa3e3e8722cf93ae46424b059e4796464ea /iconv/gconv.h
parent6f0ee4628f3075ed37481d2bdb573b6d52d9e25e (diff)
downloadglibc-e62c19f12cfc377ac9ce7c037713ead5dc6b57d9.tar.gz
glibc-e62c19f12cfc377ac9ce7c037713ead5dc6b57d9.tar.xz
glibc-e62c19f12cfc377ac9ce7c037713ead5dc6b57d9.zip
Update.
1998-04-03 15:34  Ulrich Drepper  <drepper@cygnus.com>

	* iconv/gconv_int.h: New file.  Internal header.
	* iconv/Makefile (distribute): Add gconv_int.h.
	* iconv/gconv.h: Remove definition which are now in gconv_int.h.
	* iconv/gconv_builtin.c: Adopt for gconv_int.h introduction.
	* iconv/gconv_close.c: Likewise.
	* iconv/gconv_conf.c: Likewise.
	* iconv/gconv_db.c: Likewise.
	* iconv/gconv_dl.c: Likewise.
	* iconv/gconv_int.h: Likewise.
	* iconv/gconv_open.c: Likewise.
	* iconv/iconv.c: Likewise.
	* iconv/iconv_close.c: Likewise.
	* iconv/iconv_open.c: Likewise.
	* iconv/iconv_prog.c: Likewise.

1998-04-03  Ulrich Drepper  <drepper@cygnus.com>

	* iconvdata/ksc5601.c: Correct Perl scripts and make them omit the
	missing braces.
Diffstat (limited to 'iconv/gconv.h')
-rw-r--r--iconv/gconv.h127
1 files changed, 7 insertions, 120 deletions
diff --git a/iconv/gconv.h b/iconv/gconv.h
index 139ca0d5c8..76a719785e 100644
--- a/iconv/gconv.h
+++ b/iconv/gconv.h
@@ -1,6 +1,5 @@
 /* Copyright (C) 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public License as
@@ -17,14 +16,16 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+/* This header provides no interface for a user to the internals of
+   the gconv implementation in the libc.  Therefore there is no use
+   for these definitions beside for writing additional gconv modules.  */
+
 #ifndef _GCONV_H
 #define _GCONV_H	1
 
 #include <features.h>
-#include <sys/types.h>
-#include <regex.h>
-
-__BEGIN_DECLS
+#define __need_size_t
+#include <stddef.h>
 
 /* ISO 10646 value used to signal invalid value.  */
 #define UNKNOWN_10646_CHAR	((wchar_t) 0xfffd)
@@ -47,18 +48,6 @@ enum
 };
 
 
-/* Structure for alias definition.  Simply to strings.  */
-struct gconv_alias
-{
-  __const char *fromname;
-  __const char *toname;
-};
-
-
-/* Default size of intermediate buffers.  */
-#define GCONV_DEFAULT_BUFSIZE	8160
-
-
 /* Forward declarations.  */
 struct gconv_step;
 struct gconv_step_data;
@@ -101,6 +90,7 @@ struct gconv_step_data
   void *data;		/* Pointer to step-local data.  */
 };
 
+
 /* Combine conversion step description with data.  */
 typedef struct gconv_info
 {
@@ -109,107 +99,4 @@ typedef struct gconv_info
   struct gconv_step_data *data;
 } *gconv_t;
 
-
-/* Description for an available conversion module.  */
-struct gconv_module
-{
-  __const char *from_pattern;
-  __const char *from_constpfx;
-  size_t from_constpfx_len;
-  __const regex_t *from_regex;
-
-  __const char *to_string;
-
-  int cost;
-
-  __const char *module_name;
-};
-
-
-/* Global variables.  */
-
-/* Database of alias names.  */
-extern void *__gconv_alias_db;
-
-/* Array with available modules.  */
-extern size_t __gconv_nmodules;
-extern struct gconv_module **__gconv_modules_db;
-
-
-/* Return in *HANDLE decriptor for transformation from FROMSET to TOSET.  */
-extern int __gconv_open __P ((__const char *__toset, __const char *__fromset,
-			      gconv_t *__handle));
-
-/* Free resources associated with transformation descriptor CD.  */
-extern int __gconv_close __P ((gconv_t cd));
-
-/* Transform at most *INBYTESLEFT bytes from buffer starting at *INBUF
-   according to rules described by CD and place up to *OUTBYTESLEFT
-   bytes in buffer starting at *OUTBUF.  Return number of written
-   characters in *CONVERTED if this pointer is not null.  */
-extern int __gconv __P ((gconv_t __cd,
-			 __const char **__inbuf, size_t *__inbytesleft,
-			 char **__outbuf, size_t *__outbytesleft,
-			 size_t *__converted));
-
-/* Return in *HANDLE a pointer to an array with *NSTEPS elements describing
-   the single steps necessary for transformation from FROMSET to TOSET.  */
-extern int __gconv_find_transform __P ((__const char *__toset,
-					__const char *__fromset,
-					struct gconv_step **__handle,
-					size_t *__nsteps));
-
-/* Read all the configuration data and cache it.  */
-extern void __gconv_read_conf __P ((void));
-
-/* Comparison function to search alias.  */
-extern int __gconv_alias_compare __P ((__const void *__p1,
-				       __const void *__p2));
-
-/* Clear reference to transformation step implementations which might
-   cause the code to be unloaded.  */
-extern int __gconv_close_transform __P ((struct gconv_step *__steps,
-					 size_t __nsteps));
-
-
-/* Find in the shared object associated with HANDLE for a function with
-   name NAME.  Return function pointer or NULL.  */
-extern void *__gconv_find_func __P ((void *__handle, __const char *__name));
-
-/* Load shared object named by NAME.  If already loaded increment reference
-   count.  */
-extern void *__gconv_find_shlib __P ((__const char *__name));
-
-/* Release shared object.  If no further reference is available unload
-   the object.  */
-extern int __gconv_release_shlib __P ((void *__handle));
-
-/* Fill STEP with information about builtin module with NAME.  */
-extern void __gconv_get_builtin_trans __P ((__const char *__name,
-					    struct gconv_step *__step));
-
-
-
-/* Builtin transformations.  */
-#ifdef _LIBC
-# define __BUILTIN_TRANS(Name) \
-  extern int Name __P ((struct gconv_step *__step,			      \
-			struct gconv_step_data *__data, __const char *__inbuf,\
-			size_t *__inlen, size_t *__written, int __do_flush))
-
-__BUILTIN_TRANS (__gconv_transform_dummy);
-__BUILTIN_TRANS (__gconv_transform_ucs4_utf8);
-__BUILTIN_TRANS (__gconv_transform_utf8_ucs4);
-__BUILTIN_TRANS (__gconv_transform_ucs2_ucs4);
-__BUILTIN_TRANS (__gconv_transform_ucs4_ucs2);
-# undef __BUITLIN_TRANS
-
-extern int __gconv_transform_init_rstate __P ((struct gconv_step *__step,
-					      struct gconv_step_data *__data));
-extern void __gconv_transform_end_rstate __P ((struct gconv_step_data *__data));
-
-#endif
-
-__END_DECLS
-
 #endif /* gconv.h */