about summary refs log tree commit diff
path: root/iconvdata/sjis.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-04-13 17:54:00 +0000
committerUlrich Drepper <drepper@redhat.com>1998-04-13 17:54:00 +0000
commit2aea1d796ea60b9e49d12257dc2a94bf3dd4ef26 (patch)
treea783a384cc0f7cfcc8225c407e8255a6c25e5816 /iconvdata/sjis.c
parent40c0dc53b080fd3e1ace4fbe2cb79007babec6c3 (diff)
downloadglibc-2aea1d796ea60b9e49d12257dc2a94bf3dd4ef26.tar.gz
glibc-2aea1d796ea60b9e49d12257dc2a94bf3dd4ef26.tar.xz
glibc-2aea1d796ea60b9e49d12257dc2a94bf3dd4ef26.zip
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.
Diffstat (limited to 'iconvdata/sjis.c')
-rw-r--r--iconvdata/sjis.c47
1 files changed, 10 insertions, 37 deletions
diff --git a/iconvdata/sjis.c b/iconvdata/sjis.c
index b1320c1104..7a81c017e9 100644
--- a/iconvdata/sjis.c
+++ b/iconvdata/sjis.c
@@ -19,8 +19,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <gconv.h>
-#include <inttypes.h>
-#include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 #include <wchar.h>
 
@@ -3983,53 +3982,29 @@ static const char from_ucs4_cjk[32657][2] =
 
 
 /* Direction of the transformation.  */
-enum direction
-{
-  illegal,
-  to_sjis,
-  from_sjis
-};
-
-struct sjis_data
-{
-  enum direction dir;
-};
+static int to_sjis_object;
+static int from_sjis_object;
 
 
 int
 gconv_init (struct gconv_step *step)
 {
   /* Determine which direction.  */
-  struct sjis_data *new_data;
-  enum direction dir;
-  int result;
-
   if (strcasestr (step->from_name, "SJIS") != NULL)
-    dir = from_sjis;
+    step->data = &from_sjis_object;
   else if (strcasestr (step->to_name, "SJIS") != NULL)
-    dir = to_sjis;
+    step->data = &to_sjis_object;
   else
-    dir = illegal;
-
-  result = GCONV_NOCONV;
-  if (dir != illegal
-      && ((new_data
-	   = (struct sjis_data *) malloc (sizeof (struct sjis_data)))
-	  != NULL))
-    {
-      new_data->dir = dir;
-      step->data = new_data;
-      result = GCONV_OK;
-    }
+    return GCONV_NOCONV;
 
-  return result;
+  return GCONV_OK;
 }
 
 
 void
 gconv_end (struct gconv_step *data)
 {
-  free (data->data);
+  /* Nothing to do.  */
 }
 
 
@@ -4063,15 +4038,13 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
     }
   else
     {
-      enum direction dir = ((struct sjis_data *) step->data)->dir;
-
       do_write = 0;
 
       do
 	{
 	  result = GCONV_OK;
 
-	  if (dir == from_sjis)
+	  if (step->data == &from_sjis_object)
 	    {
 	      size_t inchars = *inbufsize;
 	      size_t outwchars = data->outbufavail;
@@ -4236,7 +4209,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
 	  if (data->is_last)
 	    {
 	      /* This is the last step.  */
-	      result = (*inbufsize > (dir == from_sjis
+	      result = (*inbufsize > (step->data == &from_sjis_object
 				      ? 0 : sizeof (wchar_t) - 1)
 			? GCONV_FULL_OUTPUT : GCONV_EMPTY_INPUT);
 	      break;