From: tomo <tomo>
Date: Mon, 29 Sep 2003 10:34:21 +0000 (+0000)
Subject: (load_char_decoding_entry_maybe): Use `chise_ds_get_ccs' instead of
X-Git-Tag: r21-4-12-chise-0_21-pre6-a2-for-libchise-b1~1
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=c9da5b7576af3753fc34aa87c45aedbbc96aae0d;p=chise%2Fxemacs-chise.git

(load_char_decoding_entry_maybe): Use `chise_ds_get_ccs' instead of
`chise_ds_open_ccs_table'; don't use `chise_ccst_close'.
---

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 4219f26..4e7a3c1 100644
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -2316,10 +2316,9 @@ load_char_decoding_entry_maybe (Lisp_Object ccs, int code_point)
   accessmask = DB_RDONLY;
 
   dt_ccs
-    = chise_ds_open_ccs_table (default_chise_data_source,
-			       XSTRING_DATA (Fsymbol_name
-					     (XCHARSET_NAME(ccs))),
-			       real_subtype, accessmask, modemask);
+    = chise_ds_get_ccs (default_chise_data_source,
+			XSTRING_DATA (Fsymbol_name (XCHARSET_NAME(ccs))),
+			real_subtype, accessmask, modemask);
   if (dt_ccs == NULL)
     {
       printf ("Can't open decoding-table %s\n",
@@ -2328,17 +2327,12 @@ load_char_decoding_entry_maybe (Lisp_Object ccs, int code_point)
     }
 
   char_id = chise_ccs_decode (dt_ccs, code_point);
-  /*
-  printf ("%s's 0x%X (%d) => 0x%X\n",
-	  XSTRING_DATA (Fsymbol_name (XCHARSET_NAME(ccs))),
-	  code_point, code_point, char_id);
-  */
   if (char_id >= 0)
     decoding_table_put_char (ccs, code_point, make_char (char_id));
   else
     decoding_table_put_char (ccs, code_point, Qnil);
 
-  chise_ccst_close (dt_ccs);
+  /* chise_ccst_close (dt_ccs); */
   return char_id;
 #else
   Lisp_Object db;