From: tomo <tomo>
Date: Fri, 3 Oct 2003 12:04:24 +0000 (+0000)
Subject: (load_char_decoding_entry_maybe): Use `chise_ds_decode_char' instead
X-Git-Tag: r21-4-12-chise-0_21-pre7-for-libchise-b1-r0_2_0-pre7~27
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e49e5610c4fcf793044dd654734932a37d8bfe5;p=chise%2Fxemacs-chise.git

(load_char_decoding_entry_maybe): Use `chise_ds_decode_char' instead
of `chise_ds_get_ccs' and `chise_ccs_decode'.
---

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 0a3123e..47a5774 100644
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -2296,23 +2296,15 @@ Emchar
 load_char_decoding_entry_maybe (Lisp_Object ccs, int code_point)
 {
 #ifdef CHISE
-  CHISE_CCS dt_ccs;
   CHISE_Char_ID char_id;
 
   if ( open_chise_data_source_maybe () )
     return -1;
 
-  dt_ccs
-    = chise_ds_get_ccs (default_chise_data_source,
-			XSTRING_DATA (Fsymbol_name (XCHARSET_NAME(ccs))));
-  if (dt_ccs == NULL)
-    {
-      printf ("Can't open decoding-table %s\n",
-	      XSTRING_DATA (Fsymbol_name (XCHARSET_NAME(ccs))));
-      return -1;
-    }
-
-  char_id = chise_ccs_decode (dt_ccs, code_point);
+  char_id
+    = chise_ds_decode_char (default_chise_data_source,
+			    XSTRING_DATA(Fsymbol_name (XCHARSET_NAME(ccs))),
+			    code_point);
   if (char_id >= 0)
     decoding_table_put_char (ccs, code_point, make_char (char_id));
   else