(chise_open_data_source): Add new arguments `subtype' and `modemask'.

(chise_ds_get_feature): Delete arguments `real_subtype', `accessmask',
`modemask'.
(chise_char_feature_value_iterate): Return an integer value.
(chise_char_feature_str_iterate): Comment out.
(chise_ds_open_feature_table): Delete arguments `real_subtype',
`accessmask', `modemask'.
(chise_ds_get_ccs): Delete arguments `real_subtype', `accessmask',
`modemask'.
(chise_ccs_set_decoded_char): Renamed from `chise_ccst_put_char'.
(chise_ccs_sync): New prototype.
(chise_ds_open_ccs_table): Abolished.
(int chise_ccst_close): Abolished.

diff --git a/chise.h b/chise.h
index 1a40f2a..8cf6bfc 100644 (file)
--- a/chise.h
+++ b/chise.h
@@ -12,7 +12,9 @@ typedef enum CHISE_DS_Type
 
 typedef struct CHISE_DS CHISE_DS;
 
-CHISE_DS* chise_open_data_source (CHISE_DS_Type type, char *location);
+CHISE_DS*
+chise_open_data_source (CHISE_DS_Type type, char *location,
+                       DBTYPE subtype, int modemask);
 
 int chise_ds_close (CHISE_DS *ds);
 
@@ -45,9 +47,7 @@ typedef struct CHISE_Feature_Table CHISE_Feature_Table;
 typedef CHISE_Feature_Table* CHISE_Feature;
 
 CHISE_Feature
-chise_ds_get_feature (CHISE_DS *ds, const unsigned char *feature,
-                     DBTYPE real_subtype,
-                     u_int32_t accessmask, int modemask);
+chise_ds_get_feature (CHISE_DS *ds, const unsigned char *feature);
 
 int chise_char_load_feature_value (CHISE_Char_ID cid,
                                   CHISE_Feature feature,
@@ -58,45 +58,46 @@ chise_char_gets_feature_value (CHISE_Char_ID cid,
                               CHISE_Feature feature,
                               unsigned char *dst, size_t size);
 
-void
+int
 chise_char_feature_value_iterate (CHISE_Feature feature,
                                  int (*func) (CHISE_Char_ID cid,
                                               CHISE_Feature feature,
                                               CHISE_Value *valdatum));
 
-void
+#if 0
+int
 chise_char_feature_str_iterate (CHISE_Feature feature,
                                int (*func) (CHISE_Char_ID cid,
                                             CHISE_Feature feature,
                                             unsigned char *str));
+#endif
 
-
+#if 1
 CHISE_Feature_Table*
-chise_ds_open_feature_table (CHISE_DS *ds, const char *feature,
-                            DBTYPE real_subtype,
-                            u_int32_t accessmask, int modemask);
+chise_ds_open_feature_table (CHISE_DS *ds, const char *feature);
 
 int chise_ft_close (CHISE_Feature_Table *table);
+#endif
 
 
 typedef struct CHISE_CCS_Table CHISE_CCS_Table;
 typedef CHISE_CCS_Table* CHISE_CCS;
 
 CHISE_CCS
-chise_ds_get_ccs (CHISE_DS *ds, const unsigned char *ccs,
-                 DBTYPE real_subtype,
-                 u_int32_t accessmask, int modemask);
+chise_ds_get_ccs (CHISE_DS *ds, const unsigned char *ccs);
 
 CHISE_Char_ID chise_ccs_decode (CHISE_CCS ccs, int code_point);
 
+int chise_ccs_set_decoded_char (CHISE_CCS ccs,
+                               int code_point, CHISE_Char_ID cid);
+
+int chise_ccs_sync (CHISE_CCS ccs);
+
+#if 0
 CHISE_CCS_Table*
-chise_ds_open_ccs_table (CHISE_DS *ds, const char *ccs,
-                        DBTYPE real_subtype,
-                        u_int32_t accessmask, int modemask);
+chise_ds_open_ccs_table (CHISE_DS *ds, const char *ccs);
 
 int chise_ccst_close (CHISE_CCS_Table *table);
-
-int chise_ccst_put_char (CHISE_CCS_Table *table,
-                        int code_point, CHISE_Char_ID cid);
+#endif
 
 #endif /* !_CHISE_H */