Group counters into struct

[innduct.git] / infile.c

diff --git a/infile.c b/infile.c
index 3fc1ff6c945500db7c68e5ef69fe0ede2eecc2d0..7ff6a518573a862d6615a4dafef8deab8dc46c6f 100644 (file)
--- a/infile.c
+++ b/infile.c
@@ -77,11 +77,11 @@ 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.read_err++;
+  if (ipf->counts.read_err > max_bad_data_initial +
+      (ipf->counts.read_ok + ipf->counts.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.read_err, ipf->counts.read_ok, ipf->counts.read_blank);
   return OOP_CONTINUE;
 }
 
@@ -129,7 +129,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.read_blank++;
     return OOP_CONTINUE;
   }
 
@@ -144,7 +144,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.read_ok++;
 
   art= xmalloc(sizeof(*art) - 1 + midlen + 1);
   memset(art,0,sizeof(*art));