From b04989164df973eaf6565d1c9bf2505215a54604 Mon Sep 17 00:00:00 2001
From: Thomas Voss <mail@thomasvoss.com>
Date: Fri, 10 May 2024 23:47:31 +0200
Subject: Add daextend() to the new dynarr system

---
 lib/dynarr/daextend.c | 22 ++++++++++++++++++++++
 lib/dynarr/dapush.c   | 22 ----------------------
 2 files changed, 22 insertions(+), 22 deletions(-)
 create mode 100644 lib/dynarr/daextend.c
 delete mode 100644 lib/dynarr/dapush.c

(limited to 'lib/dynarr')

diff --git a/lib/dynarr/daextend.c b/lib/dynarr/daextend.c
new file mode 100644
index 0000000..efa96d5
--- /dev/null
+++ b/lib/dynarr/daextend.c
@@ -0,0 +1,22 @@
+#include <errno.h>
+#include <stdbit.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "dynarr.h"
+
+void *
+(daextend)(void *da, void *xs, size_t n, size_t sz, size_t align)
+{
+	dynarr(uint8_t) cpy;
+	memcpy(&cpy, da, sizeof(cpy));
+
+	if ((cpy.len += n) > cpy.cap) {
+		size_t ncap = stdc_bit_ceil(cpy.len);
+		cpy.buf = cpy.alloc(cpy.ctx, cpy.buf, cpy.cap, ncap, sz, align);
+		cpy.cap = ncap;
+	}
+
+	memcpy(cpy.buf + cpy.len * sz - n * sz, xs, n * sz);
+	return memcpy(da, &cpy, sizeof(cpy));
+}
diff --git a/lib/dynarr/dapush.c b/lib/dynarr/dapush.c
deleted file mode 100644
index 11fde1b..0000000
--- a/lib/dynarr/dapush.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <errno.h>
-#include <stdbit.h>
-#include <stdint.h>
-#include <string.h>
-
-#include "dynarr.h"
-
-void *
-(dapush)(void *da, void *x, size_t sz, size_t align)
-{
-	dynarr(uint8_t) cpy;
-	memcpy(&cpy, da, sizeof(cpy));
-
-	if (++cpy.len > cpy.cap) {
-		size_t ncap = stdc_bit_ceil(cpy.len);
-		cpy.buf = cpy.alloc(cpy.ctx, cpy.buf, cpy.cap, ncap, sz, align);
-		cpy.cap = ncap;
-	}
-
-	memcpy(cpy.buf + cpy.len * sz - sz, x, sz);
-	return memcpy(da, &cpy, sizeof(cpy));
-}
-- 
cgit v1.2.3