X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=infile.c;h=4e34c626e1a34eb4d7599b8cac7f1c717d3a6d85;hb=9ced337e4366f3cb775b59a790f0efce8e2b52ad;hp=3fc1ff6c945500db7c68e5ef69fe0ede2eecc2d0;hpb=0d0b89542d5657ecb96b02f35b1bfdd53c635cb2;p=innduct.git

diff --git a/infile.c b/infile.c
index 3fc1ff6..4e34c62 100644
--- a/infile.c
+++ b/infile.c
@@ -77,11 +77,13 @@ static void *feedfile_got_bad_data(InputFile *ipf, off_t offset,
 				   const char *data, const char *how) {
   warn("corrupted file: %s, offset %lu: %s: in %s",
        ipf->path, (unsigned long)offset, how, sanitise(data,-1));
-  ipf->readcount_err++;
-  if (ipf->readcount_err > max_bad_data_initial +
-      (ipf->readcount_ok+ipf->readcount_blank) / max_bad_data_ratio)
+  ipf->counts.events[read_err]++;
+  if (ipf->counts.events[read_err] > max_bad_data_initial +
+      (ipf->counts.events[read_ok] + ipf->counts.events[read_blank])
+                                                  / max_bad_data_ratio)
     crash("too much garbage in input file!  (%d errs, %d ok, %d blank)",
-	  ipf->readcount_err, ipf->readcount_ok, ipf->readcount_blank);
+	  ipf->counts.events[read_err], ipf->counts.events[read_ok],
+	  ipf->counts.events[read_blank]);
   return OOP_CONTINUE;
 }
 
@@ -129,7 +131,7 @@ static void *feedfile_got_article(oop_source *lp, oop_read *rd,
 
   if (data[0]==' ') {
     if (strspn(data," ") != recsz) X_BAD_DATA("line partially blanked");
-    ipf->readcount_blank++;
+    ipf->counts.events[read_blank]++;
     return OOP_CONTINUE;
   }
 
@@ -144,7 +146,7 @@ static void *feedfile_got_article(oop_source *lp, oop_read *rd,
   tokentextbuf[tokenlen]= 0;
   if (!IsToken(tokentextbuf)) X_BAD_DATA("token wrong syntax");
 
-  ipf->readcount_ok++;
+  ipf->counts.events[read_ok]++;
 
   art= xmalloc(sizeof(*art) - 1 + midlen + 1);
   memset(art,0,sizeof(*art));