about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-06-12 22:31:34 +0000
committerUlrich Drepper <drepper@redhat.com>2000-06-12 22:31:34 +0000
commit4d37e19c34bf96551f11c9ea6437413bd2248bb5 (patch)
tree5e2e1888f0221a79b27387c9b0957e6911d6b8c0
parent30010c63998925c94234aea9aeee67bdb6d04e37 (diff)
downloadglibc-4d37e19c34bf96551f11c9ea6437413bd2248bb5.tar.gz
glibc-4d37e19c34bf96551f11c9ea6437413bd2248bb5.tar.xz
glibc-4d37e19c34bf96551f11c9ea6437413bd2248bb5.zip
Update.
2000-06-12  Ulrich Drepper  <drepper@redhat.com>

	* iconv/gconv.h (__gconv_trans_context_fct): Remove two
	parameters.
	* iconv/skeleton.c (FUNCTION_NAME): Call __trans_context_fct if it
	exists.
-rw-r--r--ChangeLog7
-rw-r--r--iconv/gconv.h4
-rw-r--r--iconv/skeleton.c7
3 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6bb155e912..d533c38105 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-06-12  Ulrich Drepper  <drepper@redhat.com>
+
+	* iconv/gconv.h (__gconv_trans_context_fct): Remove two
+	parameters.
+	* iconv/skeleton.c (FUNCTION_NAME): Call __trans_context_fct if it
+	exists.
+
 2000-06-12  Jes Sorensen  <jes@linuxcare.com>
 
 	* sysdeps/unix/sysv/linux/ia64/kernel_stat.h: New file.
diff --git a/iconv/gconv.h b/iconv/gconv.h
index 5717ddbea0..2bba133d0c 100644
--- a/iconv/gconv.h
+++ b/iconv/gconv.h
@@ -87,9 +87,7 @@ typedef int (*__gconv_trans_fct) (struct __gconv_step *step,
 typedef int (*__gconv_trans_context_fct) (struct __gconv_trans_data *data,
 					  __const unsigned char *,
 					  __const unsigned char *,
-					  __const unsigned char *,
-					  unsigned char *, unsigned char *,
-					  unsigned char *);
+					  unsigned char *, unsigned char *);
 
 /* Function to query module about supported encoded character sets.  */
 typedef int (*__gconv_trans_query_fct) (__const char **, size_t *);
diff --git a/iconv/skeleton.c b/iconv/skeleton.c
index dca2c7f7a6..d64d7599b4 100644
--- a/iconv/skeleton.c
+++ b/iconv/skeleton.c
@@ -412,6 +412,13 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
 	    }
 #endif
 
+	  /* Give the transliteration module the chance to store the
+	     original text and the result in case it needs a context.  */
+	  if (data->__trans.__trans_context_fct != NULL)
+	    DL_CALL_FCT (data->__trans.__trans_context_fct,
+			 (data->__trans.__data, inptr, *inptrp,
+			  outstart, outbuf));
+
 	  /* We finished one use of the loops.  */
 	  ++data->__invocation_counter;