[cvs] bogofilter/src datastore_db.c,1.24,1.25

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

Update of /cvsroot/bogofilter/bogofilter/src
In directory sc8-pr-cvs1:/tmp/cvs-serv30223/src

Modified Files:
	datastore_db.c 
Log Message:
Reformat to improve readability.  Move db_cachesize to globals.c to improve its scope.

Index: datastore_db.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/datastore_db.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- datastore_db.c	17 Jul 2003 04:06:19 -0000	1.24
+++ datastore_db.c	17 Jul 2003 18:42:29 -0000	1.25
@@ -33,15 +33,15 @@
 #include "xstrdup.h"
 
 typedef struct {
-    char *filename;
-    size_t count;    
-    char *name[2];
-    int fd;
-    dbmode_t open_mode;
-    DB *dbp[2];
-    pid_t pid;
-    bool locked;
-    int  is_swapped;
+    char	*filename;
+    size_t	count;
+    char	*name[2];
+    int		fd;
+    dbmode_t	open_mode;
+    DB		*dbp[2];
+    pid_t	pid;
+    bool	locked;
+    int		is_swapped;
     /*@owned@*/ void *dbh_word;	/* database handle */
     /*@owned@*/ void *dbh_good;	/* database handle */
     /*@owned@*/ void *dbh_spam;	/* database handle */
@@ -57,8 +57,6 @@
 #define	DB_OPEN(db, file, database, dbtype, flags, mode) db->open(db, file, database, dbtype, flags, mode)
 #endif
 
-int db_cachesize = 0;	/* in MB */
-
 /* Function prototypes */
 
 /* Function definitions */
@@ -351,7 +349,8 @@
 	    exit(2);
 	}
     }
-    if (!found &&DEBUG_DATABASE(3)) {
+
+    if (!found && DEBUG_DATABASE(3)) {
 	fprintf(dbgout, "db_getvalues (%s): [",
 		handle->name[0]);
 	word_puts(word, 0, dbgout);
@@ -401,7 +400,6 @@
 		cv[0] = swap_32bit(val->count[i]);
 		cv[1] = swap_32bit(val->date);
 	    }
-
 	}
 	db_data.data = &cv;			/* and save array in wordlist */
 	if (!datestamp_tokens || val->date == 0)