[cvs] bogofilter/src bogoconfig.c,1.81,1.82 bogoutil.c,1.37,1.38 common.h,1.13,1.14 globals.c,1.28,1.29 wordlists.c,1.16,1.17

[<m-...@us...>]

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

Modified Files:
	bogoconfig.c bogoutil.c common.h globals.c wordlists.c 
Log Message:
Remove W_UNKNOWN, clean up wordlist parameter handling.

Index: bogoconfig.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/bogoconfig.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- bogoconfig.c	19 Jul 2003 00:29:22 -0000	1.81
+++ bogoconfig.c	19 Jul 2003 10:08:01 -0000	1.82
@@ -610,10 +610,12 @@
 	    exit(0);
 
 	case 'W':
+	    wordlists++;
 	    switch (wordlists) {
-	    case W_UNKNOWN:  wordlists = W_COMBINED; break;
-	    case W_COMBINED: wordlists = W_SEPARATE; break;
-	    case W_SEPARATE: 
+	    case W_COMBINED:
+	    case W_SEPARATE:
+		break;
+	    default:
 		fprintf(stderr, "Invalid -W option.\n");
 		exit(2);
 	    }

Index: bogoutil.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/bogoutil.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- bogoutil.c	19 Jul 2003 00:29:22 -0000	1.37
+++ bogoutil.c	19 Jul 2003 10:08:02 -0000	1.38
@@ -537,7 +537,7 @@
 	    ok = (build_path(filepath1, sizeof(filepath1), path, SPAMFILE) == 0 &&
 		  build_path(filepath2, sizeof(filepath2), path, GOODFILE) == 0 );
 	    break;
-	case W_UNKNOWN:
+	default:
 	    fprintf(stderr, "Invalid wordlist mode.\n");
 	    exit(2);
 	}
@@ -693,10 +693,12 @@
 	    exit(0);
 
 	case 'W':
+	    wordlists++;
 	    switch (wordlists) {
-	    case W_UNKNOWN:  wordlists = W_COMBINED; break;
-	    case W_COMBINED: wordlists = W_SEPARATE; break;
-	    case W_SEPARATE: 
+	    case W_COMBINED:
+	    case W_SEPARATE:
+		break;
+	    default:
 		fprintf(stderr, "Invalid -W option.\n");
 		exit(2);
 	    }

Index: common.h
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/common.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- common.h	19 Jul 2003 00:29:12 -0000	1.13
+++ common.h	19 Jul 2003 10:08:02 -0000	1.14
@@ -100,9 +100,8 @@
 
 #define	W_DEFAULT   W_COMBINED
 
-typedef enum wl_e { W_UNKNOWN=0,
-		    W_SEPARATE=1,
-		    W_COMBINED=2 } wl_t;
+typedef enum wl_e { W_COMBINED=0,
+		    W_SEPARATE=1 } wl_t;
 
 #include "globals.h"
 

Index: globals.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/globals.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- globals.c	19 Jul 2003 00:29:12 -0000	1.28
+++ globals.c	19 Jul 2003 10:08:02 -0000	1.29
@@ -36,7 +36,7 @@
 bool	terse;				/* '-t' */
 int	test = 0;			/* '-T' */
 int	verbose;			/* '-v' */
-wl_t	wordlists = W_UNKNOWN;		/* '-W' */
+wl_t	wordlists = 0;			/* '-W' */
 
 /* config file options */
 int	max_repeats;

Index: wordlists.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/wordlists.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- wordlists.c	19 Jul 2003 00:29:17 -0000	1.16
+++ wordlists.c	19 Jul 2003 10:08:02 -0000	1.17
@@ -184,7 +184,7 @@
 	    case W_SEPARATE:
 		list->dbh = db_open(list->filepath, cSeparate, aSeparate, mode);
 		break;
-	    case W_UNKNOWN:
+	    default: /* W_UNKNOWN */
 		if (list->dbh == NULL) {
 		    list->dbh = db_open(list->filepath, cCombined, aCombined, mode);
 		    if (list->dbh == NULL)
@@ -195,8 +195,6 @@
 		    if (list->dbh == NULL)
 			wordlists = W_SEPARATE;
 		}
-		if (wordlists == W_UNKNOWN)
-		    wordlists = W_COMBINED;
 		break;
 	    }
 	    if (list->dbh == NULL) {