[cvs] bogofilter/src rstats.c,1.51,1.52 score.c,1.56,1.57 score.h,1.6,1.7

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

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

Modified Files:
	rstats.c score.c score.h 
Log Message:
Fix Rtable formatting when in message header.

Index: score.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/score.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- score.c	4 Sep 2005 14:49:43 -0000	1.56
+++ score.c	30 Jan 2006 22:35:55 -0000	1.57
@@ -408,18 +408,18 @@
     return score.spamicity;
 }
 
-void msg_print_summary(void)
+void msg_print_summary(const char *pfx)
 {
     if (!Rtable) {
-	(void)fprintf(fpo, "%-*s %6lu %9.6f %9.6f %9.6f\n",
-		      MAXTOKENLEN+2, "N_P_Q_S_s_x_md", (unsigned long)score.robn, 
+	(void)fprintf(fpo, "%s%-*s %6lu %9.6f %9.6f %9.6f\n",
+		      pfx, MAXTOKENLEN+2, "N_P_Q_S_s_x_md", (unsigned long)score.robn, 
 		      score.p_pr, score.q_pr, score.spamicity);
-	(void)fprintf(fpo, "%-*s  %9.6f %9.6f %9.6f\n",
-		      MAXTOKENLEN+2+6, " ", robs, robx, min_dev);
+	(void)fprintf(fpo, "%s%-*s  %9.6f %9.6f %9.6f\n",
+		      pfx, MAXTOKENLEN+2+6, " ", robs, robx, min_dev);
     }
     else
-	(void)fprintf(fpo, "%-*s %6lu %9.2e %9.2e %9.2e %9.2e %9.2e %5.3f\n",
-		      MAXTOKENLEN+2, "N_P_Q_S_s_x_md", (unsigned long)score.robn, 
+	(void)fprintf(fpo, "%s%-*s %6lu %9.2e %9.2e %9.2e %9.2e %9.2e %5.3f\n",
+		      pfx, MAXTOKENLEN+2, "N_P_Q_S_s_x_md", (unsigned long)score.robn, 
 		      score.p_pr, score.q_pr, score.spamicity, robs, robx, min_dev);
 }
 

Index: rstats.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/rstats.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- rstats.c	15 Mar 2005 12:25:59 -0000	1.51
+++ rstats.c	30 Jan 2006 22:35:55 -0000	1.52
@@ -228,14 +228,16 @@
 static void rstats_print_rtable(rstats_t **rstats_array, size_t count)
 {
     size_t r;
+    const char *pfx = !stats_in_header ? "" : "  ";
+
 
     /* print header */
     if (!Rtable)
-	(void)fprintf(fpo, "%*s %6s    %-6s    %-6s    %-6s %s\n",
-		      MAXTOKENLEN+2,"","n", "pgood", "pbad", "fw", "U");
+	(void)fprintf(fpo, "%s%*s %6s    %-6s    %-6s    %-6s %s\n",
+		      pfx, MAXTOKENLEN+2,"","n", "pgood", "pbad", "fw", "U");
     else
-	(void)fprintf(fpo, "%*s %6s    %-6s    %-6s    %-6s  %-6s    %-6s %s\n",
-		      MAXTOKENLEN+2,"","n", "pgood", "pbad", "fw","invfwlog", "fwlog", "U");
+	(void)fprintf(fpo, "%s%*s %6s    %-6s    %-6s    %-6s  %-6s    %-6s %s\n",
+		      pfx, MAXTOKENLEN+2,"","n", "pgood", "pbad", "fw","invfwlog", "fwlog", "U");
 
     /* Print 1 line per token */
     for (r= 0; r<count; r+=1)
@@ -245,7 +247,7 @@
 	double fw = calc_prob(cur->good, cur->bad, cur->msgs_good, cur->msgs_bad);
 	char flag = (fabs(fw-EVEN_ODDS) - min_dev >= EPS) ? '+' : '-';
 
-	(void)fputc( '"', fpo);
+	(void)fprintf(fpo, "%s\"", pfx);
 	(void)word_puts(cur->token, 0, fpo);
 
 	if (cur->msgs_good == 0 && cur->msgs_bad == 0)
@@ -264,11 +266,11 @@
 			  fw);
 
 	if (Rtable)
-	    (void)fprintf(fpo, "%10.5f%10.5f",
-			  log(1.0 - fw), log(fw));
-	(void)fprintf(fpo, " %c\n", flag);
+	    (void)fprintf(fpo, "%s%10.5f%10.5f",
+			  pfx, log(1.0 - fw), log(fw));
+	(void)fprintf(fpo, "%s %c\n", pfx, flag);
     }
 
     /* print trailer */
-    msg_print_summary();
+    msg_print_summary(pfx);
 }

Index: score.h
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/score.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- score.h	18 Jan 2005 04:55:20 -0000	1.6
+++ score.h	30 Jan 2006 22:35:55 -0000	1.7
@@ -30,7 +30,7 @@
 extern	double	msg_spamicity(void);
 extern	rc_t	msg_status(void);
 extern	void	msg_print_stats(FILE *fp);
-extern	void	msg_print_summary(void);
+extern	void	msg_print_summary(const char *pfx);
 
 extern	 void	print_summary(void);