From: tomo <tomo>
Date: Sun, 12 Sep 1999 12:28:18 +0000 (+0000)
Subject: (make_charset): Initialize `CHARSET_TO_BYTE1_TABLE(cs)' and
X-Git-Tag: r21-2-19-utf-2000-0_7-0~30
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=ba309e9b3835411b0184a25f4fb164ccc3f7d8c3;p=chise%2Fxemacs-chise.git

(make_charset): Initialize `CHARSET_TO_BYTE1_TABLE(cs)' and
`CHARSET_TO_BYTE2_TABLE(cs)' by NULL if table is not defined.
---

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 514c209..255b2d3 100644
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -1904,11 +1904,15 @@ make_charset (Charset_ID id, Lisp_Object name,
 					       CHARSET_TO_BYTE1_TABLE(cs));
 	    }
 	}
+      else
+	CHARSET_TO_BYTE1_TABLE(cs) = NULL;
+      CHARSET_TO_BYTE2_TABLE(cs) = NULL;
 #endif
       break;
     case CHARSET_TYPE_96:
       CHARSET_DIMENSION (cs) = 1;
       CHARSET_CHARS (cs) = 96;
+#ifdef UTF2000
       if (decoding_table != NULL)
 	{
 	  size_t i;
@@ -1922,23 +1926,43 @@ make_charset (Charset_ID id, Lisp_Object name,
 					       CHARSET_TO_BYTE1_TABLE(cs));
 	    }
 	}
+      else
+	CHARSET_TO_BYTE1_TABLE(cs) = NULL;
+      CHARSET_TO_BYTE2_TABLE(cs) = NULL;
+#endif
       break;
     case CHARSET_TYPE_94X94:
       CHARSET_DIMENSION (cs) = 2;
       CHARSET_CHARS (cs) = 94;
+#ifdef UTF2000
+      CHARSET_TO_BYTE1_TABLE(cs) = NULL;
+      CHARSET_TO_BYTE2_TABLE(cs) = NULL;
+#endif
       break;
     case CHARSET_TYPE_96X96:
       CHARSET_DIMENSION (cs) = 2;
       CHARSET_CHARS (cs) = 96;
+#ifdef UTF2000
+      CHARSET_TO_BYTE1_TABLE(cs) = NULL;
+      CHARSET_TO_BYTE2_TABLE(cs) = NULL;
+#endif
       break;
 #ifdef UTF2000
     case CHARSET_TYPE_128X128:
       CHARSET_DIMENSION (cs) = 2;
       CHARSET_CHARS (cs) = 128;
+#ifdef UTF2000
+      CHARSET_TO_BYTE1_TABLE(cs) = NULL;
+      CHARSET_TO_BYTE2_TABLE(cs) = NULL;
+#endif
       break;
     case CHARSET_TYPE_256X256:
       CHARSET_DIMENSION (cs) = 2;
       CHARSET_CHARS (cs) = 256;
+#ifdef UTF2000
+      CHARSET_TO_BYTE1_TABLE(cs) = NULL;
+      CHARSET_TO_BYTE2_TABLE(cs) = NULL;
+#endif
       break;
 #endif
     }