From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Sun, 16 May 2021 09:06:39 +0000 (+0200)
Subject: zone-update: tiny refactoring
X-Git-Tag: v3.1.0~112^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9b53dfbc2736001b4d9fd2d03a4d1bd2c012b53;p=thirdparty%2Fknot-dns.git

zone-update: tiny refactoring
---

diff --git a/src/knot/events/handlers/dnssec.c b/src/knot/events/handlers/dnssec.c
index ace19118db..ddfd3343b9 100644
--- a/src/knot/events/handlers/dnssec.c
+++ b/src/knot/events/handlers/dnssec.c
@@ -102,16 +102,12 @@ int event_dnssec(conf_t *conf, zone_t *zone)
 		goto done;
 	}
 
-	zone_changed = !zone_update_no_change(&up);
-	if (zone_changed) {
-		ret = zone_update_commit(conf, &up);
-		if (ret != KNOT_EOK) {
-			goto done;
-		}
-	} else {
-		zone_update_clear(&up);
+	ret = zone_update_commit(conf, &up);
+	if (ret != KNOT_EOK) {
+		goto done;
 	}
 
+	zone_changed = !zone_update_no_change(&up);
 done:
 	// Schedule dependent events
 	event_dnssec_reschedule(conf, zone, &resch, zone_changed);
diff --git a/src/knot/updates/zone-update.c b/src/knot/updates/zone-update.c
index 375c0b35aa..cd9420ec7c 100644
--- a/src/knot/updates/zone-update.c
+++ b/src/knot/updates/zone-update.c
@@ -857,18 +857,11 @@ int zone_update_commit(conf_t *conf, zone_update_t *update)
 
 	int ret = KNOT_EOK;
 
-	if (update->flags & UPDATE_INCREMENTAL) {
-		if (changeset_empty(&update->change) &&
-		    update->zone->contents != NULL) {
-			changeset_clear(&update->change);
-			changeset_clear(&update->extra_ch);
-			zone_update_clear(update);
-			return KNOT_EOK;
-		}
+	if ((update->flags & UPDATE_INCREMENTAL) && changeset_empty(&update->change)) {
+		zone_update_clear(update);
+		return KNOT_EOK;
 	}
-	if (update->flags & UPDATE_INCREMENTAL) {
-		ret = commit_incremental(conf, update);
-	} else if ((update->flags & UPDATE_HYBRID)) {
+	if (update->flags & (UPDATE_INCREMENTAL | UPDATE_HYBRID)) {
 		ret = commit_incremental(conf, update);
 	} else {
 		ret = commit_full(conf, update);