mempatter: public mm_realloc()

src/knot/updates/apply.c

@@ -66,6 +66,7 @@ static int free_additional(zone_node_t **node, void *data)
 
 /* ------------------------- Empty node cleanup ----------------------------- */
 
+/*! \todo move this to new zone API - zone should do this automatically. */
 /*! \brief Deletes possibly empty node and all its empty parents recursively. */
 static void delete_empty_node(zone_tree_t *tree, zone_node_t *node)
 {
@@ -175,6 +176,7 @@ static bool can_remove(const zone_node_t *node, const knot_rrset_t *rr)
 	return false;
 }
 
+/*! \todo part of the new zone API. */
 static bool rrset_is_nsec3rel(const knot_rrset_t *rr)
 {
 	if (rr == NULL) {

src/knot/zone/node.c

@@ -25,27 +25,6 @@
 #include "libknot/descriptor.h"
 #include "libknot/mempattern.h"
 
-static void *mm_realloc(mm_ctx_t *mm, void *what, size_t size, size_t prev_size)
-{
-	if (mm) {
-		void *p = mm->alloc(mm->ctx, size);
-		if (knot_unlikely(p == NULL)) {
-			return NULL;
-		} else {
-			if (what) {
-				memcpy(p, what,
-				       prev_size < size ? prev_size : size);
-			}
-			if (mm->free) {
-				mm->free(what);
-			}
-			return p;
-		}
-	} else {
-		return realloc(what, size);
-	}
-}
-
 /*! \brief Clears allocated data in RRSet entry. */
 static void rr_data_clear(struct rr_data *data, mm_ctx_t *mm)
 {

src/libknot/mempattern.c

@@ -39,6 +39,28 @@ void *mm_alloc(mm_ctx_t *mm, size_t size)
 	}
 }
 
+void *mm_realloc(mm_ctx_t *mm, void *what, size_t size, size_t prev_size)
+{
+	if (mm) {
+		void *p = mm->alloc(mm->ctx, size);
+		if (p == NULL) {
+			return NULL;
+		} else {
+			if (what) {
+				memcpy(p, what,
+				       prev_size < size ? prev_size : size);
+			}
+			if (mm->free) {
+				mm->free(what);
+			}
+			return p;
+		}
+	} else {
+		return realloc(what, size);
+	}
+}
+
+
 void mm_free(mm_ctx_t *mm, void *what)
 {
 	if (mm) {

src/libknot/mempattern.h

@@ -46,6 +46,8 @@ typedef struct mm_ctx {
 /*! \brief Allocs using 'mm' if any, uses system malloc() otherwise. */
 void *mm_alloc(mm_ctx_t *mm, size_t size);
 /*! \brief Reallocs using 'mm' if any, uses system realloc() otherwise. */
+void *mm_realloc(mm_ctx_t *mm, void *what, size_t size, size_t prev_size);
+/*! \brief Free using 'mm' if any, uses system free() otherwise. */
 void mm_free(mm_ctx_t *mm, void *what);
 
 /*! \brief Initialize default memory allocation context. */

src/libknot/rdataset.c

@@ -22,27 +22,6 @@
 #include "libknot/rdataset.h"
 #include "libknot/common.h"
 
-static void *mm_realloc(mm_ctx_t *mm, void *what, size_t size, size_t prev_size)
-{
-	if (mm) {
-		void *p = mm->alloc(mm->ctx, size);
-		if (knot_unlikely(p == NULL)) {
-			return NULL;
-		} else {
-			if (what) {
-				memcpy(p, what,
-				       prev_size < size ? prev_size : size);
-			}
-			if (mm->free) {
-				mm->free(what);
-			}
-			return p;
-		}
-	} else {
-		return realloc(what, size);
-	}
-}
-
 static knot_rdata_t *rr_seek(knot_rdata_t *d, size_t pos)
 {
 	if (d == NULL) {