[cvs] bogofilter/src bogohist.c,1.12,1.13 bogotune.c,1.142,1.143 datastore.c,1.39,1.40 datastore_db.c,1.102,1.103 maint.c,1.45,1.46

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

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

Modified Files:
	bogohist.c bogotune.c datastore.c datastore_db.c maint.c 
Log Message:
Cleanup calls to ds_init().

Index: bogohist.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/bogohist.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- bogohist.c	29 May 2004 13:27:19 -0000	1.12
+++ bogohist.c	8 Jun 2004 14:16:57 -0000	1.13
@@ -136,7 +136,6 @@
 
     build_wordlist_path(filepath, sizeof(filepath), path);
 
-    ds_init();
     dsh = ds_open(CURDIR_S, filepath, DS_READ);
     if (dsh == NULL)
 	return EX_ERROR;
@@ -148,6 +147,7 @@
     ds_cleanup();
 
     memset(&hist, 0, sizeof(hist));
+    ds_init();
     rc = ds_oper(filepath, DS_READ, ds_histogram_hook, &hist);
 
     count = print_histogram(&hist);

Index: bogotune.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/bogotune.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- bogotune.c	4 Jun 2004 13:18:43 -0000	1.142
+++ bogotune.c	8 Jun 2004 14:16:57 -0000	1.143
@@ -1669,6 +1669,8 @@
 	check_wordlist_path();
     }
 
+    ds_init();
+
     bogotune();
 
     bogotune_free();

Index: datastore.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/datastore.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- datastore.c	7 Jun 2004 20:10:16 -0000	1.39
+++ datastore.c	8 Jun 2004 14:16:57 -0000	1.40
@@ -131,6 +131,7 @@
     if (!v)
 	return NULL;
 
+    ds_init();
     dsh = dsh_init(v);
 
     if (create && (open_mode & DS_WRITE) && ! (open_mode & DS_LOAD))
@@ -307,7 +308,6 @@
     int  ret = 0;
     void *dsh;
 
-    ds_init();
     dsh = ds_open(CURDIR_S, path, open_mode);
 
     if (dsh == NULL) {

Index: datastore_db.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/datastore_db.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- datastore_db.c	8 Jun 2004 13:45:27 -0000	1.102
+++ datastore_db.c	8 Jun 2004 14:17:07 -0000	1.103
@@ -88,6 +88,8 @@
 {
     int ret;
 
+    db_init();
+
     ret = db->open(db,
 #if DB_AT_LEAST(4,1)
     	    0,	/* TXN handle - we use autocommit instead */

Index: maint.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/maint.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- maint.c	29 May 2004 13:27:20 -0000	1.45
+++ maint.c	8 Jun 2004 14:17:07 -0000	1.46
@@ -170,7 +170,6 @@
     dsh_t *dsh;
     bool done = false;
 
-    ds_init();
     dsh = ds_open(CURDIR_S, db_file, DS_WRITE);
 
     if (dsh == NULL)