From 26e7cade138bca1eee2ab514ff2d7c5fe26510cd Mon Sep 17 00:00:00 2001
From: tomo <tomo>
Date: Thu, 28 Aug 2003 16:26:04 +0000
Subject: [PATCH] (CHISE_Feature): New type. (chise_ds_get_feature): New
 prototype. (chise_char_load_feature_value): Renamed from
 `chise_ft_get_value'; modify interface.
 (chise_char_gets_feature_value): New prototype.
 (chise_char_feature_value_iterate): Renamed from
 `chise_ft_iterate'; modify interface.
 (chise_char_feature_str_iterate): New prototype.
 (CHISE_CCS_Table): Renamed from `CHISE_Decoding_Table'.
 (CHISE_CCS): New type. (chise_ds_get_ccs): New prototype.
 (chise_ccs_decode): Renamed from `chise_dt_get_char'.
 (chise_ds_open_ccs_table): Renamed from
 `chise_ds_open_decoding_table'. (chise_ccst_close): Renamed
 from `chise_dt_close'. (chise_ccst_put_char): Renamed from
 `chise_dt_put_char'. (chise_decode_char): Deleted.
 (chise_get_feature): Deleted.

---
 chise.h |   64 +++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 42 insertions(+), 22 deletions(-)

diff --git a/chise.h b/chise.h
index fd1f771..1a40f2a 100644
--- a/chise.h
+++ b/chise.h
@@ -42,41 +42,61 @@ chise_value_to_c_string (const CHISE_Value *s)
 
 
 typedef struct CHISE_Feature_Table CHISE_Feature_Table;
+typedef CHISE_Feature_Table* CHISE_Feature;
 
-CHISE_Feature_Table*
-chise_ds_open_feature_table (CHISE_DS *ds, const char *feature,
-			     DBTYPE real_subtype,
-			     u_int32_t accessmask, int modemask);
+CHISE_Feature
+chise_ds_get_feature (CHISE_DS *ds, const unsigned char *feature,
+		      DBTYPE real_subtype,
+		      u_int32_t accessmask, int modemask);
 
-int chise_ft_close (CHISE_Feature_Table *table);
+int chise_char_load_feature_value (CHISE_Char_ID cid,
+				   CHISE_Feature feature,
+				   CHISE_Value *valdatum);
+
+unsigned char*
+chise_char_gets_feature_value (CHISE_Char_ID cid,
+			       CHISE_Feature feature,
+			       unsigned char *dst, size_t size);
 
-int chise_ft_get_value (CHISE_Feature_Table *table,
-			CHISE_Char_ID cid, CHISE_Value *valdatum);
+void
+chise_char_feature_value_iterate (CHISE_Feature feature,
+				  int (*func) (CHISE_Char_ID cid,
+					       CHISE_Feature feature,
+					       CHISE_Value *valdatum));
 
 void
-chise_ft_iterate (CHISE_Feature_Table *table,
-		  int (*func) (CHISE_Feature_Table *table,
-			       CHISE_Char_ID cid, CHISE_Value *valdatum));
+chise_char_feature_str_iterate (CHISE_Feature feature,
+				int (*func) (CHISE_Char_ID cid,
+					     CHISE_Feature feature,
+					     unsigned char *str));
 
 
-typedef struct CHISE_Decoding_Table CHISE_Decoding_Table;
+CHISE_Feature_Table*
+chise_ds_open_feature_table (CHISE_DS *ds, const char *feature,
+			     DBTYPE real_subtype,
+			     u_int32_t accessmask, int modemask);
+
+int chise_ft_close (CHISE_Feature_Table *table);
 
-CHISE_Decoding_Table*
-chise_ds_open_decoding_table (CHISE_DS *ds, const char *ccs,
-			      DBTYPE real_subtype,
-			      u_int32_t accessmask, int modemask);
 
-int chise_dt_close (CHISE_Decoding_Table *table);
+typedef struct CHISE_CCS_Table CHISE_CCS_Table;
+typedef CHISE_CCS_Table* CHISE_CCS;
 
-CHISE_Char_ID chise_dt_get_char (CHISE_Decoding_Table *table, int code_point);
+CHISE_CCS
+chise_ds_get_ccs (CHISE_DS *ds, const unsigned char *ccs,
+		  DBTYPE real_subtype,
+		  u_int32_t accessmask, int modemask);
 
-int chise_dt_put_char (CHISE_Decoding_Table *table,
-		       int code_point, CHISE_Char_ID cid);
+CHISE_Char_ID chise_ccs_decode (CHISE_CCS ccs, int code_point);
 
+CHISE_CCS_Table*
+chise_ds_open_ccs_table (CHISE_DS *ds, const char *ccs,
+			 DBTYPE real_subtype,
+			 u_int32_t accessmask, int modemask);
 
-CHISE_Char_ID chise_decode_char (CHISE_DS *ds, char *ccs, int code_point);
+int chise_ccst_close (CHISE_CCS_Table *table);
 
-int chise_get_feature (CHISE_DS *ds, CHISE_Char_ID cid,
-		       char *key, CHISE_Value *valdatum);
+int chise_ccst_put_char (CHISE_CCS_Table *table,
+			 int code_point, CHISE_Char_ID cid);
 
 #endif /* !_CHISE_H */
-- 
1.7.10.4