[cvs] bogofilter/src bogoconfig.c,1.83,1.84 bogoutil.c,1.39,1.40 wordlists.c,1.18,1.19 wordlists.h,1.4,1.5

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

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

Modified Files:
	bogoconfig.c bogoutil.c wordlists.c wordlists.h 
Log Message:
Rename function.

Index: bogoconfig.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/bogoconfig.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- bogoconfig.c	19 Jul 2003 19:04:56 -0000	1.83
+++ bogoconfig.c	19 Jul 2003 19:12:22 -0000	1.84
@@ -610,7 +610,7 @@
 	    exit(0);
 
 	case 'W':
-	    incr_wordlist_mode_flag();
+	    incr_wordlist_mode();
 	    break;
 
 	case 'x':

Index: bogoutil.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/bogoutil.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- bogoutil.c	19 Jul 2003 19:04:56 -0000	1.39
+++ bogoutil.c	19 Jul 2003 19:12:22 -0000	1.40
@@ -665,7 +665,7 @@
 	    exit(0);
 
 	case 'W':
-	    incr_wordlist_mode_flag();
+	    incr_wordlist_mode();
 	    break;
 
 	case 'x':

Index: wordlists.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/wordlists.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- wordlists.c	19 Jul 2003 19:04:56 -0000	1.18
+++ wordlists.c	19 Jul 2003 19:12:22 -0000	1.19
@@ -169,6 +169,18 @@
 const char *aSeparate[] = { SPAMFILE, GOODFILE };
 size_t	    cSeparate = COUNTOF(aSeparate);
 
+void incr_wordlist_mode(void)
+{
+    switch (wl_mode) {
+    case WL_M_UNKNOWN:  wl_mode = WL_M_COMBINED; break;
+    case WL_M_COMBINED: wl_mode = WL_M_SEPARATE; break;
+    case WL_M_SEPARATE: 
+	fprintf(stderr, "Invalid -W option.\n");
+	exit(2);
+    }
+    return;
+}
+
 void set_wordlist_mode(void **dbhp, const char *filepath, dbmode_t dbmode)
 {
     if (wl_mode == WL_M_UNKNOWN) {
@@ -266,18 +278,6 @@
 	xfree(list);
     }
     word_lists = NULL;
-}
-
-void incr_wordlist_mode_flag(void)
-{
-    switch (wl_mode) {
-    case WL_M_UNKNOWN:  wl_mode = WL_M_COMBINED; break;
-    case WL_M_COMBINED: wl_mode = WL_M_SEPARATE; break;
-    case WL_M_SEPARATE: 
-	fprintf(stderr, "Invalid -W option.\n");
-	exit(2);
-    }
-    return;
 }
 
 size_t build_wordlist_paths(char **filepaths, const char *path)

Index: wordlists.h
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/wordlists.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- wordlists.h	19 Jul 2003 19:04:56 -0000	1.4
+++ wordlists.h	19 Jul 2003 19:12:22 -0000	1.5
@@ -39,7 +39,7 @@
 extern wordlist_t *word_list;
 extern wordlist_t *word_lists;
 
-void incr_wordlist_mode_flag(void);
+void incr_wordlist_mode(void);
 void set_wordlist_mode(void **dbh, const char *filepath, dbmode_t dbmode);
 size_t build_wordlist_paths(char **filepaths, const char *path);