Merge branch '2559-cid-329159-logically-dead-code-in-lib-dns-journal-c' into 'main'

Resolve "CID 329159: Logically dead code in lib/dns/journal.c"

Closes #2559

See merge request isc-projects/bind9!4780
This commit is contained in:
Mark Andrews 2021-03-08 05:25:17 +00:00
commit bc714bc5c5

View file

@ -1714,7 +1714,7 @@ dns_journal_print(isc_mem_t *mctx, uint32_t flags, const char *filename,
name, ttl, rdata, &tuple));
dns_diff_append(&diff, &tuple);
if (++n_put != 0 || printxhdr) {
if (++n_put > 100 || printxhdr) {
result = dns_diff_print(&diff, file);
dns_diff_clear(&diff);
n_put = 0;
@ -1728,7 +1728,7 @@ dns_journal_print(isc_mem_t *mctx, uint32_t flags, const char *filename,
}
CHECK(result);
if (!printxhdr && n_put != 0) {
if (n_put != 0) {
result = dns_diff_print(&diff, file);
dns_diff_clear(&diff);
}