[cvs] bogofilter/src datastore_db.c,1.211,1.212

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

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

Modified Files:
	datastore_db.c 
Log Message:
Ensure eTransaction is properly set for print_version().

Index: datastore_db.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/datastore_db.c,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -d -r1.211 -r1.212
--- datastore_db.c	1 May 2005 18:40:36 -0000	1.211
+++ datastore_db.c	1 May 2005 19:44:39 -0000	1.212
@@ -95,6 +95,14 @@
     return buf;
 }
 
+static void set_txn_mode(void)
+{
+    if (eTransaction == T_DEFAULT_OFF)
+	eTransaction =  T_DISABLED;
+    if (eTransaction == T_DEFAULT_ON)
+	eTransaction =  T_ENABLED;
+}
+
 #if !defined(ENABLE_TRANSACTIONS) && !defined(DISABLE_TRANSACTIONS)
 static const char *txn2str(e_txn txn)
 {
@@ -138,11 +146,6 @@
     }
 
     /* else use default txnue */
-    if (txn == T_DEFAULT_OFF)
-	txn =  T_DISABLED;
-    if (txn == T_DEFAULT_ON)
-	txn =  T_ENABLED;
-
     if (DEBUG_DATABASE(1))
 	fprintf(dbgout, "\n");
 
@@ -267,6 +270,8 @@
 
     eTransaction = get_txn_state(bfp);
 
+    set_txn_mode();
+
     if (eTransaction == T_DISABLED)
 	dsm = &dsm_traditional;
     else
@@ -274,10 +279,7 @@
 #else
     (void)bfp;
 
-    if (eTransaction == T_DEFAULT_OFF)
-	eTransaction =  T_DISABLED;
-    if (eTransaction == T_DEFAULT_ON)
-	eTransaction =  T_ENABLED;
+    set_txn_mode();
 #endif
 }
 
@@ -514,6 +516,7 @@
 #if	!defined(ENABLE_TRANSACTIONS) && !defined(DISABLE_TRANSACTIONS)
     strcat(v, " AUTO-XA");
 #else
+    set_txn_mode();
     if (eTransaction == T_ENABLED)
 	strcat(v, " TRANSACTIONAL");
     else