[cvs] bogofilter/src score.c,1.18,1.19 wordlists.c,1.63,1.64 wordlists_base.c,1.18,1.19 wordlists_base.h,1.10,1.11

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

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

Modified Files:
	score.c wordlists.c wordlists_base.c wordlists_base.h 
Log Message:
Remove 'bad' attribute from struct wordlist_s because it was invariant.

Index: score.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/score.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- score.c	22 May 2004 15:19:55 -0000	1.18
+++ score.c	22 May 2004 15:48:31 -0000	1.19
@@ -76,9 +76,9 @@
 	rstats_print(unsure);
 }
 
-static void wordprob_add(wordcnts_t *cnts, uint count, uint bad)
+static void wordprob_add(wordcnts_t *cnts, uint count, uint idx)
 {
-    if (bad)
+    if (idx == IX_SPAM)
 	cnts->bad += count;
     else
 	cnts->good += count;
@@ -126,7 +126,7 @@
 		val.count[i] = 0;
 		ds_write(list->dsh, token, &val);
 	    }
-	    wordprob_add(cnts, val.count[i], list->bad[i]);
+	    wordprob_add(cnts, val.count[i], i);
 	}
 
 	if (DEBUG_ALGORITHM(1)) {

Index: wordlists.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/wordlists.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- wordlists.c	22 May 2004 15:31:13 -0000	1.63
+++ wordlists.c	22 May 2004 15:48:31 -0000	1.64
@@ -33,7 +33,7 @@
     int retry;
 
     if (word_lists == NULL)
-	init_wordlist(&word_lists, "word", WORDLIST, true, false, 0, WL_REGULAR);
+	init_wordlist(&word_lists, "word", WORDLIST, 0, WL_REGULAR);
 
     do {
 	ds_init();
@@ -210,7 +210,7 @@
     precedence=atoi(tmp);
     tmp = spanword(tmp);
     
-    rc = init_wordlist(&wl, listname, filename, true, false, precedence, type);
+    rc = init_wordlist(&wl, listname, filename, precedence, type);
     ok = rc == 0;
 
     if (ok)

Index: wordlists_base.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/wordlists_base.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- wordlists_base.c	22 May 2004 15:12:12 -0000	1.18
+++ wordlists_base.c	22 May 2004 15:48:31 -0000	1.19
@@ -20,7 +20,7 @@
 /* returns -1 for error, 0 for success */
 int init_wordlist(/*@out@*/ wordlist_t **list, 
 		  const char* name, const char* path,
-		  bool sbad, bool gbad, int override, WL_TYPE type)
+		  int override, WL_TYPE type)
 {
     wordlist_t *n = (wordlist_t *)xcalloc(1, sizeof(*n));
     wordlist_t *list_ptr;
@@ -34,8 +34,6 @@
     n->index   =++listcount;
     n->type    =type;
     n->override=override;
-    n->bad[IX_SPAM]=sbad;
-    n->bad[IX_GOOD]=gbad;
 
     list_ptr=word_lists;
 

Index: wordlists_base.h
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/wordlists_base.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- wordlists_base.h	22 May 2004 15:12:12 -0000	1.10
+++ wordlists_base.h	22 May 2004 15:48:31 -0000	1.11
@@ -26,15 +26,15 @@
     /*@owned@*/ dsh_t *dsh;	/* datastore handle */
     u_int32_t	msgcount[IX_SIZE];	/* count of messages in wordlist. */
     WL_TYPE	type;		/* 'I' for "ignore" */
-    bool	bad[IX_SIZE];
     int		override;
 };
 
 /*@null@*/ 
 extern wordlist_t *word_list;
 
-int init_wordlist(/*@out@*/ wordlist_t **list, const char* name, const char* path,
-		  bool sbad, bool gbad, int override, WL_TYPE type);
+int init_wordlist(/*@out@*/ wordlist_t **list, 
+		  const char* name, const char* path,
+		  int override, WL_TYPE type);
 
 void free_wordlists(void);