Update.

1998-04-13 17:40  Ulrich Drepper  <drepper@cygnus.com>

	* iconvdata/8bit-gap.c: Simplify step data handling.
	* iconvdata/8bit-generic.c: Likewise.
	* iconvdata/big5.c: Likewise.
	* iconvdata/euccn.c: Likewise.
	* iconvdata/eucjp.c: Likewise.
	* iconvdata/euckr.c: Likewise.
	* iconvdata/euctw.c: Likewise.
	* iconvdata/iso6937.c: Likewise.
	* iconvdata/iso8859-1.c: Likewise.
	* iconvdata/jis0208.h: Likewise.
	* iconvdata/jis0212.c: Likewise.
	* iconvdata/jis0212.h: Likewise.
	* iconvdata/johab.c: Likewise.
	* iconvdata/ksc5601.h: Likewise.
	* iconvdata/sjis.c: Likewise.
	* iconvdata/t61.c: Likewise.
	* iconvdata/uhc.c: Likewise.

1 files changed, 10 insertions, 37 deletions

diff --git a/iconvdata/johab.c b/iconvdata/johab.c
index bde56ce1d3..51b235c924 100644
--- a/iconvdata/johab.c
+++ b/iconvdata/johab.c
@@ -19,24 +19,14 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <gconv.h>
-#include <inttypes.h>
-#include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 #include <wchar.h>
 #include <ksc5601.h>
 
 /* Direction of the transformation.  */
-enum direction
-  {
-    illegal,
-    to_johab,
-    from_johab
-  };
-
-struct johab_data
-  {
-    enum direction dir;
-  };
+static int to_johab_object;
+static int from_johab_object;
 
 /* The table for Bit pattern to Hangul Jamo
    5 bits each are used to encode
@@ -242,36 +232,21 @@ int
 gconv_init (struct gconv_step *step)
 {
   /* Determine which direction.  */
-  struct johab_data *new_data;
-  enum direction dir;
-  int result;
-
   if (strcasestr (step->from_name, "JOHAB") != NULL)
-    dir = from_johab;
+    step->data = &from_johab_object;
   else if (strcasestr (step->to_name, "JOHAB") != NULL)
-    dir = to_johab;
+    step->data = &to_johab_object;
   else
-    dir = illegal;
+    return GCONV_NOCONV;
 
-  result = GCONV_NOCONV;
-  if (dir != illegal
-      && ((new_data
-	   = (struct johab_data *) malloc (sizeof (struct johab_data)))
-	  != NULL))
-    {
-      new_data->dir = dir;
-      step->data = new_data;
-      result = GCONV_OK;
-    }
-
-  return result;
+  return GCONV_OK;
 }
 
 
 void
 gconv_end (struct gconv_step *data)
 {
-  free (data->data);
+  /* Nothing to do.  */
 }
 
 
@@ -308,15 +283,13 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
     }
   else
     {
-      enum direction dir = ((struct johab_data *) step->data)->dir;
-
       do_write = 0;
 
       do
 	{
 	  result = GCONV_OK;
 
-	  if (dir == from_johab)
+	  if (step->data == &from_johab_object)
 	    {
 	      size_t inchars = *inbufsize;
 	      size_t outwchars = data->outbufavail;
@@ -517,7 +490,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
 	  if (data->is_last)
 	    {
 	      /* This is the last step.  */
-	      result = (*inbufsize > (dir == from_johab
+	      result = (*inbufsize > (step->data == &from_johab_object
 				      ? 0 : sizeof (wchar_t) - 1)
 			? GCONV_FULL_OUTPUT : GCONV_EMPTY_INPUT);
 	      break;