Remove support for custom allocator

Author: k0ekk0ek

CMakeLists.txt

@@ -140,7 +140,6 @@ target_sources(zone PRIVATE
   src/log.c
   src/parser.c
   src/lexer.c
-  src/heap.c
   src/generic/base16.c
   src/generic/base32.c
   src/generic/base64.c

include/zone.h

@@ -440,10 +440,6 @@ struct zone_file {
 typedef struct zone_parser zone_parser_t;
 struct zone_parser;
 
-typedef void *(*zone_malloc_t)(void *arena, size_t size);
-typedef void *(*zone_realloc_t)(void *arena, void *ptr, size_t size);
-typedef void(*zone_free_t)(void *arena, void *ptr);
-
 /**
  * @defgroup log_categories Log categories.
  *
@@ -529,9 +525,6 @@ typedef zone_return_t(*zone_add_t)(
   void *); // user data
 
 typedef struct {
-  // FIXME: add a flags member. e.g. to allow for includes in combination
-  //        with static buffers, signal ownership of allocated memory, etc
-  uint32_t flags;
   /** Lax mode of operation. */
   /** Authoritative servers may choose to be more lenient when operating as
       as a secondary as data may have been transferred over AXFR/IXFR that
@@ -540,15 +533,11 @@ typedef struct {
   /** Disable $INCLUDE directive. */
   /** Useful in setups where untrusted input may be offered. */
   bool no_includes;
+  /** Enable 1h2m3s notations for TTLS. */
+  bool pretty_ttls;
   const char *origin;
   uint32_t default_ttl;
   uint16_t default_class;
-  struct {
-    zone_malloc_t malloc;
-    zone_realloc_t realloc;
-    zone_free_t free;
-    void *arena;
-  } allocator;
   struct {
     /** Message categories to write out. */
     /** All categories are printed if no categories are selected and no

src/fallback/bench.c

@@ -8,7 +8,6 @@
  */
 #include "zone.h"
 #include "diagnostic.h"
-#include "heap.h"
 #include "log.h"
 #include "lexer.h"
 #include "fallback/scanner.h"

src/fallback/parser.c

@@ -12,7 +12,6 @@
 
 #include "zone.h"
 #include "diagnostic.h"
-#include "heap.h"
 #include "log.h"
 #include "lexer.h"
 #include "fallback/scanner.h"

src/fallback/scanner.h

@@ -157,7 +157,7 @@ static inline void refill(zone_parser_t *parser)
   if (file->buffer.length == file->buffer.size) {
     size_t size = file->buffer.size + ZONE_WINDOW_SIZE;
     char *data = file->buffer.data;
-    if (!(data = zone_realloc(parser, data, size + 1)))
+    if (!(data = realloc(data, size + 1)))
       SYNTAX_ERROR(parser, "actually out of memory");
     file->buffer.size = size;
     file->buffer.data = data;

src/generic/scanner.h

@@ -180,7 +180,7 @@ static inline void refill(zone_parser_t *parser)
   if (file->buffer.length == file->buffer.size) {
     size_t size = file->buffer.size + ZONE_WINDOW_SIZE;
     char *data = file->buffer.data;
-    if (!(data = zone_realloc(parser, data, size + 1)))
+    if (!(data = realloc(data, size + 1)))
       SYNTAX_ERROR(parser, "actually out of memory");
     file->buffer.size = size;
     file->buffer.data = data;

src/haswell/bench.c

@@ -8,7 +8,6 @@
  */
 #include "zone.h"
 #include "diagnostic.h"
-#include "heap.h"
 #include "log.h"
 #include "haswell/simd.h"
 #include "haswell/bits.h"

src/haswell/parser.c

@@ -12,7 +12,6 @@
 
 #include "zone.h"
 #include "diagnostic.h"
-#include "heap.h"
 #include "log.h"
 #include "haswell/simd.h"
 #include "haswell/bits.h"

src/heap.c

@@ -8,7 +8,6 @@
  */
 #include "zone.h"
 #include "diagnostic.h"
-#include "heap.h"
 #include "log.h"
 #include "westmere/simd.h"
 #include "westmere/bits.h"

src/heap.h

@@ -12,7 +12,6 @@
 
 #include "zone.h"
 #include "diagnostic.h"
-#include "heap.h"
 #include "log.h"
 #include "westmere/simd.h"
 #include "westmere/bits.h"

src/westmere/bench.c

@@ -20,26 +20,28 @@
 #endif
 
 #include "zone.h"
-#include "heap.h"
 #include "diagnostic.h"
 #include "isadetection.h"
 
 #if _WIN32
 #define strcasecmp(s1, s2) _stricmp(s1, s2)
 #define strncasecmp(s1, s2, n) _strnicmp(s1, s2, n)
+
+static char *strndup(const char *s, size_t n)
+{
+  char *p;
+  if ((p = malloc(n + 1))) {
+    memcpy(p, s, n);
+    p[n] = '\0';
+  }
+  return p;
+}
 #endif
 
 static const char not_a_file[] = "<string>";
 
 static zone_return_t check_options(const zone_options_t *options)
 {
-  // custom allocator must be fully specified or not at all
-  int alloc = (options->allocator.malloc != 0) +
-              (options->allocator.realloc != 0) +
-              (options->allocator.free != 0) +
-              (options->allocator.arena != NULL);
-  if (alloc != 0 && alloc != 4)
-    return ZONE_BAD_PARAMETER;
   if (!options->accept.add)
     return ZONE_BAD_PARAMETER;
   if (!options->origin)
@@ -172,15 +174,17 @@ zone_nonnull_all()
 static zone_return_t open_file(
   zone_parser_t *parser, zone_file_t *file, const zone_string_t *path)
 {
-  if (!(file->name = zone_strndup(parser, path->data, path->length)))
+  (void)parser;
+
+  if (!(file->name = strndup(path->data, path->length)))
     return ZONE_OUT_OF_MEMORY;
 
 #if _WIN32
   char buf[1];
   size_t length, size = GetFullPathName(file->name, sizeof(buf), buf, NULL);
   if (!size)
     return ZONE_IO_ERROR;
-  if (!(file->path = zone_malloc(parser, size)))
+  if (!(file->path = malloc(size)))
     return ZONE_OUT_OF_MEMORY;
   if (!(length = GetFullPathName(file->name, size, file->path, NULL)))
     return ZONE_IO_ERROR;
@@ -190,7 +194,7 @@ static zone_return_t open_file(
   char buf[PATH_MAX];
   if (!realpath(file->name, buf))
     return ZONE_IO_ERROR;
-  if (!(file->path = zone_strdup(parser, buf)))
+  if (!(file->path = strdup(buf)))
     return ZONE_OUT_OF_MEMORY;
 #endif
 
@@ -202,7 +206,7 @@ static zone_return_t open_file(
         return ZONE_IO_ERROR;
     }
 
-  if (!(file->buffer.data = zone_malloc(parser, ZONE_WINDOW_SIZE + 1)))
+  if (!(file->buffer.data = malloc(ZONE_WINDOW_SIZE + 1)))
     return ZONE_OUT_OF_MEMORY;
 
   file->buffer.data[0] = '\0';
@@ -240,18 +244,18 @@ void zone_close_file(
     return;
 
   if (file->buffer.data)
-    zone_free(parser, file->buffer.data);
+    free(file->buffer.data);
   file->buffer.data = NULL;
   if (file->name)
-    zone_free(parser, (char *)file->name);
+    free((char *)file->name);
   file->name = NULL;
   if (file->path)
-    zone_free(parser, (char *)file->path);
+    free((char *)file->path);
   file->path = NULL;
   (void)fclose(file->handle);
   file->handle = NULL;
   if (file != &parser->first)
-    zone_free(parser, file);
+    free(file);
 }
 
 zone_nonnull_all()
@@ -261,7 +265,7 @@ zone_return_t zone_open_file(
   zone_file_t *file;
   zone_return_t result;
 
-  if (!(file = zone_malloc(parser, sizeof(*file))))
+  if (!(file = malloc(sizeof(*file))))
     return ZONE_OUT_OF_MEMORY;
   memset(file, 0, sizeof(*file) - sizeof(file->indexer.tape));
   if ((result = open_file(parser, file, path)) < 0)