Remove redundant assertions

The ENSURE assertion at the end of dns_diff_appendminimal() is not
needed because it is placed right after code which resets *tuplep to
NULL if it is not NULL already.

The INSIST assertion in move_matching_tuples() checks the same pointer
again.

diff --git a/lib/dns/diff.c b/lib/dns/diff.c
index fe7181b7734e4275e55a2ef9bd046289d2f6cec5..7ed4faeba515dc83268f38b0a497189770b708ff 100644 (file)
--- a/lib/dns/diff.c
+++ b/lib/dns/diff.c
@@ -196,8 +196,6 @@ dns_diff_appendminimal(dns_diff_t *diff, dns_difftuple_t **tuplep)
                ISC_LIST_APPEND(diff->tuples, *tuplep, link);
                *tuplep = NULL;
        }
-
-       ENSURE(*tuplep == NULL);
 }
 
 static isc_stdtime_t

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index cf954d9869f1d8030da34c3bbc897700a93c0849..0f63fccda1f1854c35f21ee3564543c59e874203 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -7318,7 +7318,6 @@ move_matching_tuples(dns_difftuple_t *cur, dns_diff_t *src, dns_diff_t *dst) {
                dns_difftuple_t *next = find_next_matching_tuple(cur);
                ISC_LIST_UNLINK(src->tuples, cur, link);
                dns_diff_appendminimal(dst, &cur);
-               INSIST(cur == NULL);
                cur = next;
        } while (cur != NULL);
 }