Merge branch 'contents_cleanup' into 'master'

src/knot/server/journal.c

@@ -27,6 +27,7 @@
 #include "knot/common/log.h"
 #include "knot/server/journal.h"
 #include "knot/server/serialization.h"
+#include "knot/zone/zone.h"
 #include "libknot/libknot.h"
 #include "libknot/rrtype/soa.h"
 

src/knot/server/journal.h

@@ -45,7 +45,8 @@
 #include <pthread.h>
 #include <stdbool.h>
 #include "knot/updates/changesets.h"
-#include "knot/zone/zone.h"
+
+struct zone;
 
 /*!
  * \brief Journal entry flags.

src/knot/zone/contents.h

@@ -14,32 +14,26 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /*!
- * \file contents.h
+ * \file
  *
- * \author Lubos Slovak <lubos.slovak@nic.cz>
+ * Zone contents structure and API for manipulating it.
  *
- * \brief Zone contents structure and API for manipulating it.
+ * \addtogroup knot
  *
- * \addtogroup libknot
  * @{
  */
 
 #pragma once
 
-#include "libknot/internal/lists.h"
 #include "libknot/rrtype/nsec3param.h"
 #include "knot/zone/node.h"
 #include "knot/zone/zone-tree.h"
 
-struct zone;
-
 enum zone_contents_find_dname_result {
-	ZONE_NAME_FOUND = 1,
-	ZONE_NAME_NOT_FOUND = 0
+	ZONE_NAME_NOT_FOUND = 0,
+	ZONE_NAME_FOUND     = 1
 };
 
-/*----------------------------------------------------------------------------*/
-
 typedef struct zone_contents {
 	zone_node_t *apex;       /*!< Apex node of the zone (holding SOA) */
 
@@ -54,16 +48,10 @@ typedef struct zone_contents {
  */
 typedef int (*zone_contents_apply_cb_t)(zone_node_t *node, void *data);
 
-/*----------------------------------------------------------------------------*/
-
 zone_contents_t *zone_contents_new(const knot_dname_t *apex_name);
 
 int zone_contents_add_rr(zone_contents_t *z, const knot_rrset_t *rr, zone_node_t **n);
 
-int zone_contents_remove_node(zone_contents_t *contents, const knot_dname_t *owner);
-
-int zone_contents_remove_nsec3_node(zone_contents_t *contents, const knot_dname_t *owner);
-
 /*!
  * \brief Tries to find a node with the specified name in the zone.
  *
@@ -79,7 +67,7 @@ const zone_node_t *zone_contents_find_node(const zone_contents_t *contents,
                                            const knot_dname_t *name);
 
 /*!
- * \brief Tries to find domain name in the given zone using AVL tree.
+ * \brief Tries to find a node by owner in the zone contents.
  *
  * \param[in] zone Zone to search for the name.
  * \param[in] name Domain name to search for.
@@ -261,9 +249,6 @@ void zone_contents_free(zone_contents_t **contents);
 
 void zone_contents_deep_free(zone_contents_t **contents);
 
-/*! \brief Return zone SOA rdataset. */
-const knot_rdataset_t *zone_contents_soa(const zone_contents_t *zone);
-
 /*!
  * \brief Fetch zone serial.
  *

tests/journal.c

@@ -24,7 +24,7 @@
 
 #include "libknot/libknot.h"
 #include "knot/server/journal.h"
-#include "knot/zone/zone-diff.h"
+#include "knot/zone/zone.h"
 
 #define RAND_RR_LABEL 16
 #define RAND_RR_PAYLOAD 64