From: tomo <tomo>
Date: Sun, 31 Aug 2003 09:14:48 +0000 (+0000)
Subject: (char_table_get_db): Use `chise_char_load_feature_value' instead of
X-Git-Tag: r21-4-12-chise-0_21-pre6-for-libchise-b1-r0_2_0-pre4~2
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=9fbc42235f86267f937c098927c700802a4b5db5;p=chise%2Fxemacs-chise.git

(char_table_get_db): Use `chise_char_load_feature_value' instead of
`chise_ft_get_value'.
(load_char_attribute_table_map_func): Modify for
`chise_char_feature_value_iterate'.
(Fload_char_attribute_table): Use `chise_char_feature_value_iterate'
instead of `chise_ft_iterate'.
---

diff --git a/src/chartab.c b/src/chartab.c
index cd96c92..7ef78a5 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -3455,7 +3455,8 @@ char_table_get_db (Lisp_Char_Table* cit, Emchar ch)
   Lisp_Object val;
 #ifdef CHISE
   CHISE_Value value;
-  int status = chise_ft_get_value (cit->feature_table, ch, &value);
+  int status
+    = chise_char_load_feature_value (ch, cit->feature_table, &value);
 
   if (!status)
     {
@@ -3678,21 +3679,21 @@ Lisp_Char_Table* char_attribute_table_to_load;
 
 #ifdef CHISE
 int
-load_char_attribute_table_map_func (CHISE_Feature_Table *db,
-				    CHISE_Char_ID cid,
-				    CHISE_Value *valdatum);
+load_char_attribute_table_map_func (CHISE_Char_ID cid,
+				    CHISE_Feature feature,
+				    CHISE_Value *value);
 int
-load_char_attribute_table_map_func (CHISE_Feature_Table *db,
-				    CHISE_Char_ID cid,
-				    CHISE_Value *valdatum)
+load_char_attribute_table_map_func (CHISE_Char_ID cid,
+				    CHISE_Feature feature,
+				    CHISE_Value *value)
 {
   Emchar code = cid;
   Lisp_Object ret = get_char_id_table_0 (char_attribute_table_to_load, code);
 
   if (EQ (ret, Qunloaded))
     put_char_id_table_0 (char_attribute_table_to_load, code,
-			 Fread (make_string ((Bufbyte *) valdatum->data,
-					     valdatum->size)));
+			 Fread (make_string ((Bufbyte *) value->data,
+					     value->size)));
   return 0;
 }
 #else
@@ -3735,8 +3736,9 @@ Load values of ATTRIBUTE into database file.
 
 	GCPRO1 (table);
 #ifdef CHISE
-	chise_ft_iterate (cit->feature_table,
-			  &load_char_attribute_table_map_func);
+	chise_char_feature_value_iterate
+	  (cit->feature_table,
+	   &load_char_attribute_table_map_func);
 #else
 	Fmap_database (Qload_char_attribute_table_map_function, cit->db);
 #endif