Update.

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

	* iconv/gconv.c: Rewrite of the low-level of gconv.
	* iconv/gconv.h: Likewise.
	* iconv/gconv_builtin.h: Likewise.
	* iconv/gconv_close.c: Likewise.
	* iconv/gconv_db.: Likewise.
	* iconv/gconv_dl.c: Likewise.
	* iconv/gconv_int.h: Likewise.
	* iconv/gconv_open.c: Likewise.
	* iconv/gconv_simple.c: Likewise.
	* iconvdata/8bit-gap.c: Adapt for rewrite.
	* iconvdata/8bit-generic.c: Likewise.
	* iconvdata/euckr.c: Likewise.
	* iconvdata/iso646.c: Likewise.
	* iconvdata/iso6937.c: Likewise.
	* iconvdata/iso8859-1.c: Likewise.
	* iconvdata/johab.c: Likewise.
	* iconvdata/sjis.c: Likewise.
	* iconvdata/t61.c: Likewise.
	* iconvdata/uhc.c: Likewise.

1 files changed, 4 insertions, 4 deletions

diff --git a/iconvdata/sjis.c b/iconvdata/sjis.c
index 492bbd7ade..f713db1cc4 100644
--- a/iconvdata/sjis.c
+++ b/iconvdata/sjis.c
@@ -3997,7 +3997,7 @@ struct sjis_data
 
 
 int
-gconv_init (struct gconv_step *step, struct gconv_step_data *data)
+gconv_init (struct gconv_step *step)
 {
   /* Determine which direction.  */
   struct sjis_data *new_data;
@@ -4018,7 +4018,7 @@ gconv_init (struct gconv_step *step, struct gconv_step_data *data)
 	  != NULL))
     {
       new_data->dir = dir;
-      data->data = new_data;
+      step->data = new_data;
       result = GCONV_OK;
     }
 
@@ -4027,7 +4027,7 @@ gconv_init (struct gconv_step *step, struct gconv_step_data *data)
 
 
 void
-gconv_end (struct gconv_step_data *data)
+gconv_end (struct gconv_step *data)
 {
   free (data->data);
 }
@@ -4066,7 +4066,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
     }
   else
     {
-      enum direction dir = ((struct sjis_data *) data->data)->dir;
+      enum direction dir = ((struct sjis_data *) step->data)->dir;
 
       do_write = 0;