[cvs] bogofilter/src datastore_db.c,1.161.2.13,1.161.2.14

[David R. <re...@us...>]

Update of /cvsroot/bogofilter/bogofilter/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16269

Modified Files:
      Tag: RTS
	datastore_db.c 
Log Message:
Use rmw_flag method.

Index: datastore_db.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/datastore_db.c,v
retrieving revision 1.161.2.13
retrieving revision 1.161.2.14
diff -u -d -r1.161.2.13 -r1.161.2.14
--- datastore_db.c	31 Jan 2005 01:12:17 -0000	1.161.2.13
+++ datastore_db.c	31 Jan 2005 01:13:47 -0000	1.161.2.14
@@ -580,6 +580,7 @@
 int db_get_dbvalue(void *vhandle, const dbv_t *token, /*@out@*/ dbv_t *val)
 {
     int ret = 0;
+    int rmw_flag;
     DBT db_key;
     DBT db_data;
 
@@ -602,7 +603,8 @@
     db_data.flags = DB_DBT_USERMEM;	/* saves the memcpy */
 
     /* DB_RMW can avoid deadlocks */
-    ret = dbp->get(dbp, handle->txn, &db_key, &db_data, (!fTransaction || handle->open_mode == DS_READ) ? 0 : DB_RMW);
+    rmw_flag = dsm->dsm_get_rmw_flag(handle->open_mode);
+    ret = dbp->get(dbp, handle->txn, &db_key, &db_data, rmw_flag );
 
     if (DEBUG_DATABASE(3))
 	fprintf(dbgout, "DB->get(%.*s): %s\n",