Regression fixed in 8f570c to prevent duplicate counts during disk restoration.

allinurl · allinurl · commit 31e2ac1c2708 · 2024-05-14T17:46:53.000-05:00
See #2667
diff --git a/src/parser.c b/src/parser.c
@@ -1982,6 +1982,7 @@ read_line (GLog *glog, char *line, int *test, uint32_t *cnt, int dry_run) {
     uncount_invalid (glog);
     return NULL;
   }
+  glog->read++;
 
   return logitem;
 }
@@ -2104,7 +2105,6 @@ read_lines_from_file (FILE *fp, GLog *glog, GJob jobs[2][conf.jobs], int b, char
     while ((*s = fgets (jobs[b][k].lines[jobs[b][k].p], LINE_BUFFER, fp)) != NULL) {
 #endif
       glog->bytes += strlen (jobs[b][k].lines[jobs[b][k].p]);
-      glog->read++;
 
       if (++(jobs[b][k].p) >= conf.chunk_size)
         break;  // goto next chunk

Original file line number	Diff line number	Diff line change
`@@ -1982,6 +1982,7 @@ read_line (GLog glog, char line, int test, uint32_t cnt, int dry_run) {`
`1982`	`1982`	`uncount_invalid (glog);`
`1983`	`1983`	`return NULL;`
`1984`	`1984`	`}`
	`1985`	`+ glog->read++;`
`1985`	`1986`
`1986`	`1987`	`return logitem;`
`1987`	`1988`	`}`
`@@ -2104,7 +2105,6 @@ read_lines_from_file (FILE fp, GLog glog, GJob jobs[2][conf.jobs], int b, char`
`2104`	`2105`	`while ((*s = fgets (jobs[b][k].lines[jobs[b][k].p], LINE_BUFFER, fp)) != NULL) {`
`2105`	`2106`	`#endif`
`2106`	`2107`	`glog->bytes += strlen (jobs[b][k].lines[jobs[b][k].p]);`
`2107`		`- glog->read++;`
`2108`	`2108`
`2109`	`2109`	`if (++(jobs[b][k].p) >= conf.chunk_size)`
`2110`	`2110`	`break; // goto next chunk`