From 085b77730a553ce9769fcc76b68772dbde564004 Mon Sep 17 00:00:00 2001
From: Thomas Voss <mail@thomasvoss.com>
Date: Thu, 9 May 2024 02:48:06 +0200
Subject: Add custom allocator support to u8upper()

---
 lib/alloc/alloc_arena.c   |  9 +++++++++
 lib/alloc/alloc_heap.c    | 12 ++++++++++++
 lib/alloc/arena_realloc.c |  7 ++++---
 lib/alloc/heapalloc.c     | 12 ------------
 4 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 lib/alloc/alloc_arena.c
 create mode 100644 lib/alloc/alloc_heap.c
 delete mode 100644 lib/alloc/heapalloc.c

(limited to 'lib/alloc')

diff --git a/lib/alloc/alloc_arena.c b/lib/alloc/alloc_arena.c
new file mode 100644
index 0000000..9ddc6e2
--- /dev/null
+++ b/lib/alloc/alloc_arena.c
@@ -0,0 +1,9 @@
+#include <stdlib.h>
+
+#include "alloc.h"
+
+void *
+alloc_arena(void *ctx, void *ptr, size_t old, size_t new, size_t align)
+{
+	return arena_realloc(ctx, ptr, old, new, 1, align);
+}
diff --git a/lib/alloc/alloc_heap.c b/lib/alloc/alloc_heap.c
new file mode 100644
index 0000000..72cd7ad
--- /dev/null
+++ b/lib/alloc/alloc_heap.c
@@ -0,0 +1,12 @@
+#include <stdlib.h>
+
+#include "alloc.h"
+
+void *
+alloc_heap(void *, void *ptr, size_t, size_t new, size_t)
+{
+	if (new > 0)
+		return realloc(ptr, new);
+	free(ptr);
+	return nullptr;
+}
diff --git a/lib/alloc/arena_realloc.c b/lib/alloc/arena_realloc.c
index f13ce17..b30c1b2 100644
--- a/lib/alloc/arena_realloc.c
+++ b/lib/alloc/arena_realloc.c
@@ -11,6 +11,9 @@ arena_realloc(arena *a, void *ptr, size_t old, size_t new, size_t elemsz,
 {
 	ASSUME(a != nullptr);
 
+	if (ptr == nullptr)
+		return arena_alloc(a, new, elemsz, align);
+
 	if (old == new)
 		return ptr;
 
@@ -55,7 +58,5 @@ arena_realloc(arena *a, void *ptr, size_t old, size_t new, size_t elemsz,
 
 	/* At this point we just make a new allocation and copy the data over */
 	void *dst = arena_alloc(a, new, elemsz, align);
-	if (dst == nullptr || ptr == nullptr)
-		return nullptr;
-	return memcpy(dst, ptr, new * elemsz);
+	return dst == nullptr ? nullptr : memcpy(dst, ptr, new * elemsz);
 }
diff --git a/lib/alloc/heapalloc.c b/lib/alloc/heapalloc.c
deleted file mode 100644
index 0a698f0..0000000
--- a/lib/alloc/heapalloc.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stdlib.h>
-
-#include "alloc.h"
-
-void *
-heapalloc(void *, void *ptr, size_t, size_t new)
-{
-	if (new > 0)
-		return realloc(ptr, new);
-	free(ptr);
-	return nullptr;
-}
-- 
cgit v1.2.3