zone-load: tiny cleanup

diff --git a/src/knot/zone/zone-load.c b/src/knot/zone/zone-load.c
index ab41b151a451aac01c58102c73b2fd5d38352e89..ced8830505de036d81127c2e4922453e7c9dc409 100644 (file)
--- a/src/knot/zone/zone-load.c
+++ b/src/knot/zone/zone-load.c
@@ -84,10 +84,6 @@ int zone_load_journal(conf_t *conf, zone_t *zone, zone_contents_t *contents)
                return KNOT_EINVAL;
        }
 
-       if (contents == NULL) {
-               return KNOT_EEMPTYZONE;
-       }
-
        // Check if journal is used (later in zone_changes_load() and zone is not empty.
        if (zone_contents_is_empty(contents)) {
                return KNOT_EOK;

diff --git a/src/knot/zone/zone-load.h b/src/knot/zone/zone-load.h
index 725905fbf881f24aba668a4c60ef8b432c721df3..0f06b2dad0185d137f5d217e9f3cca0070b73afb 100644 (file)
--- a/src/knot/zone/zone-load.h
+++ b/src/knot/zone/zone-load.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) 2021 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,7 +18,6 @@
 
 #include "knot/conf/conf.h"
 #include "knot/zone/zone.h"
-#include "knot/dnssec/zone-events.h" // zone_sign_reschedule_t
 
 /*!
  * \brief Load zone contents according to the configuration.
@@ -55,8 +54,7 @@ int zone_load_journal(conf_t *conf, zone_t *zone, zone_contents_t *contents);
  * \param contents
  * \return KNOT_EOK or an error
  */
-int zone_load_from_journal(conf_t *conf, zone_t *zone,
-                           zone_contents_t **contents);
+int zone_load_from_journal(conf_t *conf, zone_t *zone, zone_contents_t **contents);
 
 /*!
  * \brief Check if zone can be bootstrapped.

diff --git a/src/utils/kzonesign/main.c b/src/utils/kzonesign/main.c
index c7b5fbc9c74a5503880e75a0edbdd6cca7355e80..f5d0122a1e7146f50e58529d4982896fe80b82bd 100644 (file)
--- a/src/utils/kzonesign/main.c
+++ b/src/utils/kzonesign/main.c
@@ -18,6 +18,7 @@
 #include <stdlib.h>
 
 #include "knot/conf/conf.h"
+#include "knot/dnssec/zone-events.h"
 #include "knot/updates/zone-update.h"
 #include "knot/zone/zone-load.h"
 #include "knot/zone/zonefile.h"