[cvs] SF.net SVN: bogofilter:[6816] trunk/bogofilter/src

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

Revision: 6816
          http://bogofilter.svn.sourceforge.net/bogofilter/?rev=6816&view=rev
Author:   relson
Date:     2009-02-21 21:11:01 +0000 (Sat, 21 Feb 2009)

Log Message:
-----------
Restore listsort type info.

Modified Paths:
--------------
    trunk/bogofilter/src/listsort.c
    trunk/bogofilter/src/listsort.h
    trunk/bogofilter/src/rstats.c
    trunk/bogofilter/src/score.c
    trunk/bogofilter/src/wordhash.c

Modified: trunk/bogofilter/src/listsort.c
===================================================================
--- trunk/bogofilter/src/listsort.c	2009-02-21 21:10:04 UTC (rev 6815)
+++ trunk/bogofilter/src/listsort.c	2009-02-21 21:11:01 UTC (rev 6816)
@@ -43,12 +43,6 @@
 typedef unsigned char byte;
 #include "word.h"
 
-typedef struct element element;
-struct element {
-    element *next, *prev;
-    int i;
-};
-
 #ifdef	TEST
 
 static int cmp(const element *a, const element *b);
@@ -71,7 +65,7 @@
  *     list = listsort(mylist);
  */
 
-void *listsort(void *list, fcn_compare *compare) {
+element *listsort(element *list, fcn_compare *compare) {
     element *p, *q, *e, *tail, *oldhead;
     int insize, nmerges, psize, qsize, i;
 

Modified: trunk/bogofilter/src/listsort.h
===================================================================
--- trunk/bogofilter/src/listsort.h	2009-02-21 21:10:04 UTC (rev 6815)
+++ trunk/bogofilter/src/listsort.h	2009-02-21 21:11:01 UTC (rev 6816)
@@ -5,8 +5,14 @@
 
 #include "bftypes.h"
 
-typedef int fcn_compare(const void *a, const void *b);
+typedef struct element element;
+struct element {
+    element *next, *prev;
+    int i;
+};
 
-extern void *listsort(void *list, fcn_compare *compare);
+typedef int fcn_compare(const element *a, const element *b);
 
+extern element *listsort(element *list, fcn_compare *compare);
+
 #endif

Modified: trunk/bogofilter/src/rstats.c
===================================================================
--- trunk/bogofilter/src/rstats.c	2009-02-21 21:10:04 UTC (rev 6815)
+++ trunk/bogofilter/src/rstats.c	2009-02-21 21:11:01 UTC (rev 6816)
@@ -139,7 +139,7 @@
     size_t robn  = stats_head->robn;
 
     /* sort by ascending spamicity */
-    stats_head->list = listsort(stats_head->list, &compare_rstats_t);
+    stats_head->list = (rstats_t *)listsort((element *)stats_head->list, (fcn_compare *)&compare_rstats_t);
 
     if (Rtable || verbose>=3)
 	rstats_print_rtable(stats_head->list);

Modified: trunk/bogofilter/src/score.c
===================================================================
--- trunk/bogofilter/src/score.c	2009-02-21 21:10:04 UTC (rev 6815)
+++ trunk/bogofilter/src/score.c	2009-02-21 21:11:01 UTC (rev 6816)
@@ -380,7 +380,7 @@
     hashnode_t *node;
 
     /* sort by ascending score difference (from 0.5) */
-    wh->iter_head = listsort(wh->iter_head, &compare_hashnode_t);
+    wh->iter_head = (hashnode_t *)listsort((element *)wh->iter_head, (fcn_compare *)&compare_hashnode_t);
 
     count = max(token_count_fix, max(token_count_min, token_count_max));
 

Modified: trunk/bogofilter/src/wordhash.c
===================================================================
--- trunk/bogofilter/src/wordhash.c	2009-02-21 21:10:04 UTC (rev 6815)
+++ trunk/bogofilter/src/wordhash.c	2009-02-21 21:11:01 UTC (rev 6816)
@@ -481,7 +481,7 @@
 void
 wordhash_sort (wordhash_t *wh)
 {
-    wh->iter_head = listsort(wh->iter_head, &compare_hashnode_t);
+    wh->iter_head = (hashnode_t *)listsort((element *)wh->iter_head, (fcn_compare *)&compare_hashnode_t);
 
     return;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.