From: tomo <tomo>
Date: Thu, 2 Oct 2003 11:25:04 +0000 (+0000)
Subject: (open_chise_data_source_maybe): Modify for `chise_open_data_source'.
X-Git-Tag: r21-4-12-chise-0_21-pre7-for-libchise-b1-r0_2_0-pre6~6
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=8521b83a456ff673718b96f64fcc19b71a5909f9;p=chise%2Fxemacs-chise.git

(open_chise_data_source_maybe): Modify for `chise_open_data_source'.
(char_table_open_db_maybe): Modify for `chise_ds_open_feature_table'.
---

diff --git a/src/chartab.c b/src/chartab.c
index 7ef78a5..ea29d44 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -3353,6 +3353,7 @@ open_chise_data_source_maybe ()
   if (default_chise_data_source == NULL)
     {
       Lisp_Object db_dir = Vexec_directory;
+      int modemask = 0755;		/* rwxr-xr-x */
 
       if (NILP (db_dir))
 	db_dir = build_string ("../lib-src");
@@ -3360,7 +3361,8 @@ open_chise_data_source_maybe ()
 
       default_chise_data_source
 	= chise_open_data_source (CHISE_DS_Berkeley_DB,
-				  XSTRING_DATA (db_dir));
+				  XSTRING_DATA (db_dir),
+				  DB_HASH, modemask);
       if (default_chise_data_source == NULL)
 	return -1;
     }
@@ -3390,25 +3392,15 @@ char_table_open_db_maybe (Lisp_Char_Table* cit)
   if (!NILP (attribute))
     {
 #ifdef CHISE
-      int modemask;
-      int accessmask = 0;
-      DBTYPE real_subtype;
-
       if (cit->feature_table == NULL)
 	{
 	  if ( open_chise_data_source_maybe () )
 	    return -1;
 
-	  modemask = 0755;		/* rwxr-xr-x */
-	  real_subtype = DB_HASH;
-	  accessmask = DB_RDONLY;
-
 	  cit->feature_table
 	    = chise_ds_open_feature_table (default_chise_data_source,
 					   XSTRING_DATA (Fsymbol_name
-							 (attribute)),
-					   real_subtype,
-					   accessmask, modemask);
+							 (attribute)));
 	  if (cit->feature_table == NULL)
 	    return -1;
 	}