Adapt for rewrite of the low-level of gconv.

diff --git a/iconvdata/8bit-gap.c b/iconvdata/8bit-gap.c
index 301bd6b..1528cb6 100644 (file)
--- a/iconvdata/8bit-gap.c
+++ b/iconvdata/8bit-gap.c
@@ -50,7 +50,7 @@ struct s_8bit_data
 
 
 int
-gconv_init (struct gconv_step *step, struct gconv_step_data *data)
+gconv_init (struct gconv_step *step)
 {
   /* Determine which direction.  */
   struct s_8bit_data *new_data;
@@ -71,7 +71,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;
     }
 
@@ -80,7 +80,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);
 }
@@ -119,7 +119,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
     }
   else
     {
-      enum direction dir = ((struct s_8bit_data *) data->data)->dir;
+      enum direction dir = ((struct s_8bit_data *) step->data)->dir;
 
       do_write = 0;
 

diff --git a/iconvdata/8bit-generic.c b/iconvdata/8bit-generic.c
index e8493fc..7f0bbae 100644 (file)
--- a/iconvdata/8bit-generic.c
+++ b/iconvdata/8bit-generic.c
@@ -37,7 +37,7 @@ struct s_8bit_data
 
 
 int
-gconv_init (struct gconv_step *step, struct gconv_step_data *data)
+gconv_init (struct gconv_step *step)
 {
   /* Determine which direction.  */
   struct s_8bit_data *new_data;
@@ -58,7 +58,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;
     }
 
@@ -67,7 +67,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);
 }
@@ -106,7 +106,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
     }
   else
     {
-      enum direction dir = ((struct s_8bit_data *) data->data)->dir;
+      enum direction dir = ((struct s_8bit_data *) step->data)->dir;
 
       do_write = 0;
 

diff --git a/iconvdata/euckr.c b/iconvdata/euckr.c
index ba58034..9789e88 100644 (file)
--- a/iconvdata/euckr.c
+++ b/iconvdata/euckr.c
@@ -63,7 +63,7 @@ euckr_from_ucs4(wchar_t ch, unsigned char *cp)
 
 
 int
-gconv_init (struct gconv_step *step, struct gconv_step_data *data)
+gconv_init (struct gconv_step *step)
 {
   /* Determine which direction.  */
   struct euckr_data *new_data;
@@ -84,7 +84,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;
     }
 
@@ -93,7 +93,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);
 }
@@ -132,7 +132,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
     }
   else
     {
-      enum direction dir = ((struct euckr_data *) data->data)->dir;
+      enum direction dir = ((struct euckr_data *) step->data)->dir;
 
       do_write = 0;
 

diff --git a/iconvdata/iso646.c b/iconvdata/iso646.c
index 3b4864e..a9705f0 100644 (file)
--- a/iconvdata/iso646.c
+++ b/iconvdata/iso646.c
@@ -58,7 +58,7 @@ struct iso646_data
 
 
 int
-gconv_init (struct gconv_step *step, struct gconv_step_data *data)
+gconv_init (struct gconv_step *step)
 {
   /* Determine which direction.  */
   struct iso646_data *new_data;
@@ -100,7 +100,7 @@ gconv_init (struct gconv_step *step, struct gconv_step_data *data)
     {
       new_data->dir = dir;
       new_data->var = var;
-      data->data = new_data;
+      step->data = new_data;
       result = GCONV_OK;
     }
 
@@ -109,7 +109,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);
 }
@@ -148,8 +148,8 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
     }
   else
     {
-      enum direction dir = ((struct iso646_data *) data->data)->dir;
-      enum variant var = ((struct iso646_data *) data->data)->var;
+      enum direction dir = ((struct iso646_data *) step->data)->dir;
+      enum variant var = ((struct iso646_data *) step->data)->var;
 
       do_write = 0;
 

diff --git a/iconvdata/iso6937.c b/iconvdata/iso6937.c
index 0108036..377eef5 100644 (file)
--- a/iconvdata/iso6937.c
+++ b/iconvdata/iso6937.c
@@ -387,7 +387,7 @@ struct iso6937_data
 
 
 int
-gconv_init (struct gconv_step *step, struct gconv_step_data *data)
+gconv_init (struct gconv_step *step)
 {
   /* Determine which direction.  */
   struct iso6937_data *new_data;
@@ -408,7 +408,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;
     }
 
@@ -417,7 +417,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);
 }
@@ -456,7 +456,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
     }
   else
     {
-      enum direction dir = ((struct iso6937_data *) data->data)->dir;
+      enum direction dir = ((struct iso6937_data *) step->data)->dir;
 
       do_write = 0;
 

diff --git a/iconvdata/iso8859-1.c b/iconvdata/iso8859-1.c
index 5f98adc..cdeb526 100644 (file)
--- a/iconvdata/iso8859-1.c
+++ b/iconvdata/iso8859-1.c
@@ -37,7 +37,7 @@ struct iso88591_data
 
 
 int
-gconv_init (struct gconv_step *step, struct gconv_step_data *data)
+gconv_init (struct gconv_step *step)
 {
   /* Determine which direction.  */
   struct iso88591_data *new_data;
@@ -58,7 +58,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;
     }
 
@@ -67,7 +67,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);
 }
@@ -106,7 +106,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
     }
   else
     {
-      enum direction dir = ((struct iso88591_data *) data->data)->dir;
+      enum direction dir = ((struct iso88591_data *) step->data)->dir;
 
       do_write = 0;
 

diff --git a/iconvdata/johab.c b/iconvdata/johab.c
index 3acd5fc..bde56ce 100644 (file)
--- a/iconvdata/johab.c
+++ b/iconvdata/johab.c
@@ -239,7 +239,7 @@ johab_from_ucs4 (wchar_t ch, unsigned char *cp)
 
 
 int
-gconv_init (struct gconv_step *step, struct gconv_step_data *data)
+gconv_init (struct gconv_step *step)
 {
   /* Determine which direction.  */
   struct johab_data *new_data;
@@ -260,7 +260,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;
     }
 
@@ -269,7 +269,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);
 }
@@ -308,7 +308,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
     }
   else
     {
-      enum direction dir = ((struct johab_data *) data->data)->dir;
+      enum direction dir = ((struct johab_data *) step->data)->dir;
 
       do_write = 0;
 

diff --git a/iconvdata/sjis.c b/iconvdata/sjis.c
index 492bbd7..f713db1 100644 (file)
--- 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;
 

diff --git a/iconvdata/t61.c b/iconvdata/t61.c
index a8de21c..7d4314d 100644 (file)
--- a/iconvdata/t61.c
+++ b/iconvdata/t61.c
@@ -378,7 +378,7 @@ struct t61_data
 
 
 int
-gconv_init (struct gconv_step *step, struct gconv_step_data *data)
+gconv_init (struct gconv_step *step)
 {
   /* Determine which direction.  */
   struct t61_data *new_data;
@@ -399,7 +399,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;
     }
 
@@ -408,7 +408,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);
 }
@@ -447,7 +447,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
     }
   else
     {
-      enum direction dir = ((struct t61_data *) data->data)->dir;
+      enum direction dir = ((struct t61_data *) step->data)->dir;
 
       do_write = 0;
 

diff --git a/iconvdata/uhc.c b/iconvdata/uhc.c
index c64ff1b..9e5f009 100644 (file)
--- a/iconvdata/uhc.c
+++ b/iconvdata/uhc.c
@@ -2623,7 +2623,7 @@ uhc_from_ucs4(wchar_t ch, unsigned char *cp)
 
 
 int
-gconv_init (struct gconv_step *step, struct gconv_step_data *data)
+gconv_init (struct gconv_step *step)
 {
   /* Determine which direction.  */
   struct uhc_data *new_data;
@@ -2643,7 +2643,7 @@ gconv_init (struct gconv_step *step, struct gconv_step_data *data)
           = (struct uhc_data *) malloc (sizeof (struct uhc_data))) != NULL))
     {
       new_data->dir = dir;
-      data->data = new_data;
+      step->data = new_data;
       result = GCONV_OK;
     }
 
@@ -2652,7 +2652,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);
 }
@@ -2691,7 +2691,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
     }
   else
     {
-      enum direction dir = ((struct uhc_data *) data->data)->dir;
+      enum direction dir = ((struct uhc_data *) step->data)->dir;
 
       do_write = 0;