(chise_system_db_dir): New constant.

(CHISE_DS_open): Don't use DBTYPE.

diff --git a/chise.c b/chise.c
index 0568eb0..e76172b 100644 (file)
--- a/chise.c
+++ b/chise.c
@@ -11,6 +11,7 @@
 #include "chise-name.h"
 
 const unsigned char chise_db_dir[] = CHISE_DB_DIR;
+const unsigned char chise_system_db_dir[] = CHISE_SI_DB_DIR;
 
 CHISE_Feature_Table*
 chise_ds_open_feature_table (CHISE_DS *ds, const char *feature);
@@ -63,7 +64,7 @@ struct CHISE_DS
 
 CHISE_DS*
 CHISE_DS_open (CHISE_DS_Type type, const unsigned char *location,
-              DBTYPE subtype, int modemask)
+              int subtype, int modemask)
 {
   CHISE_DS *ds = (CHISE_DS*)malloc (sizeof (CHISE_DS));
   size_t len = strlen (location);
@@ -72,7 +73,7 @@ CHISE_DS_open (CHISE_DS_Type type, const unsigned char *location,
     return NULL;
 
   ds->type = type;
-  ds->subtype = subtype;
+  ds->subtype = ( (subtype != 0) ? subtype : DB_HASH );
   ds->modemask = modemask;
   ds->location = (unsigned char*)malloc (len + 1);
   if (ds->location == NULL)