fixup! fixup! Torvalds style

diff --git a/lib/dns/qpzone.c b/lib/dns/qpzone.c
index aa3d31980c3e9adee91d8ceeed7dd6b64d45c0ca..8182d51093a2fb0f9ebed8c9e672d9c99c8bc4e5 100644 (file)
--- a/lib/dns/qpzone.c
+++ b/lib/dns/qpzone.c
@@ -814,7 +814,6 @@ qpznode_acquire(qpznode_t *node DNS__DB_FLARG) {
 
 static void
 clean_zone_node(qpznode_t *node, uint32_t least_serial) {
-       dns_slabtop_t *top_prev = NULL;
        bool still_dirty = false;
 
        /*
@@ -840,16 +839,10 @@ clean_zone_node(qpznode_t *node, uint32_t least_serial) {
                                parent_serial = child->serial;
                        }
                }
+       }
 
-               if (top->header == NULL) {
-                       if (top_prev != NULL) {
-                               top_prev->next = top->next;
-                       } else {
-                               node->data = top->next;
-                       }
-                       dns_slabtop_destroy(node->mctx, &top);
-               } else {
-
+       DNS_SLABTOP_FOREACH(top, node->data) {
+               if (top->header != NULL) {
                        /*
                         * We now try to find the first down node less than the least
                         * serial, and if there are such rdatasets, delete it and any
@@ -877,9 +870,23 @@ clean_zone_node(qpznode_t *node, uint32_t least_serial) {
                         * because it is the most recent version.
                         */
                        still_dirty = true;
+               }
+       }
+       
+       dns_slabtop_t *top_prev = NULL;
+       DNS_SLABTOP_FOREACH(top, node->data) {
+               if (top->header == NULL) {
+                       if (top_prev != NULL) {
+                               top_prev->next = top->next;
+                       } else {
+                               node->data = top->next;
+                       }
+                       dns_slabtop_destroy(node->mctx, &top);
+               } else {
                        top_prev = top;
                }
        }
+
        if (!still_dirty) {
                node->dirty = false;
        }