darray: Remove

The new RESERVE() macro from alloc.h is nicer, and handles alignment
properly.

4 files changed, 0 insertions, 189 deletions

diff --git a/GNUmakefile b/GNUmakefile
index 2494b16..bcfdf76 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -236,7 +236,6 @@ LIBBFS := \
     $(OBJ)/src/bftw.o \
     $(OBJ)/src/color.o \
     $(OBJ)/src/ctx.o \
-    $(OBJ)/src/darray.o \
     $(OBJ)/src/diag.o \
     $(OBJ)/src/dir.o \
     $(OBJ)/src/dstring.o \
diff --git a/src/darray.c b/src/darray.c
deleted file mode 100644
index 3e66a55..0000000
--- a/src/darray.c
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include "darray.h"
-#include <stdlib.h>
-#include <string.h>
-
-/**
- * The darray header.
- */
-struct darray {
-	/** The current capacity of the array, as a count of elements. */
-	size_t capacity;
-	/** The current length of the array. */
-	size_t length;
-
-	// The array elements are stored after this header in memory.  Not using
-	// a flexible array member to avoid worrying about strict aliasing.  We
-	// assume that 2*sizeof(size_t) keeps any memory allocation suitably
-	// aligned for the element type.
-};
-
-/** Get the header for a darray. */
-static struct darray *darray_header(const void *da) {
-	return (struct darray *)da - 1;
-}
-
-/** Get the array from a darray header. */
-static char *darray_data(struct darray *header) {
-	return (char *)(header + 1);
-}
-
-size_t darray_length(const void *da) {
-	if (da) {
-		return darray_header(da)->length;
-	} else {
-		return 0;
-	}
-}
-
-void *darray_push(void *da, const void *item, size_t size) {
-	struct darray *header;
-	if (da) {
-		header = darray_header(da);
-	} else {
-		header = malloc(sizeof(*header) + size);
-		if (!header) {
-			return NULL;
-		}
-		header->capacity = 1;
-		header->length = 0;
-	}
-
-	size_t capacity = header->capacity;
-	size_t i = header->length++;
-	if (i >= capacity) {
-		capacity *= 2;
-		header = realloc(header, sizeof(*header) + capacity * size);
-		if (!header) {
-			// This failure will be detected by darray_check()
-			return da;
-		}
-		header->capacity = capacity;
-	}
-
-	char *data = darray_data(header);
-	memcpy(data + i * size, item, size);
-	return data;
-}
-
-int darray_check(void *da) {
-	if (!da) {
-		return -1;
-	}
-
-	struct darray *header = darray_header(da);
-	if (header->length <= header->capacity) {
-		return 0;
-	} else {
-		// realloc() failed in darray_push(), so reset the length and report the failure
-		header->length = header->capacity;
-		return -1;
-	}
-}
-
-void darray_free(void *da) {
-	if (da) {
-		free(darray_header(da));
-	}
-}
diff --git a/src/darray.h b/src/darray.h
deleted file mode 100644
index cc6cc42..0000000
--- a/src/darray.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-/**
- * A dynamic array library.
- *
- * darrays are represented by a simple pointer to the array element type, like
- * any other array.  Behind the scenes, the capacity and current length of the
- * array are stored along with it.  NULL is a valid way to initialize an empty
- * darray:
- *
- *     int *darray = NULL;
- *
- * To append an element to a darray, use the DARRAY_PUSH macro:
- *
- *     int e = 42;
- *     if (DARRAY_PUSH(&darray, &e) != 0) {
- *             // Report the error...
- *     }
- *
- * The length can be retrieved by darray_length().  Iterating over the array
- * works like normal arrays:
- *
- *     for (size_t i = 0; i < darray_length(darray); ++i) {
- *             printf("%d\n", darray[i]);
- *     }
- *
- * To free a darray, use darray_free():
- *
- *     darray_free(darray);
- */
-
-#ifndef BFS_DARRAY_H
-#define BFS_DARRAY_H
-
-#include <stddef.h>
-
-/**
- * Get the length of a darray.
- *
- * @param da
- *         The array in question.
- * @return
- *         The length of the array.
- */
-size_t darray_length(const void *da);
-
-/**
- * @internal Use DARRAY_PUSH().
- *
- * Push an element into a darray.
- *
- * @param da
- *         The array to append to.
- * @param item
- *         The item to append.
- * @param size
- *         The size of the item.
- * @return
- *         The (new) location of the array.
- */
-void *darray_push(void *da, const void *item, size_t size);
-
-/**
- * @internal Use DARRAY_PUSH().
- *
- * Check if the last darray_push() call failed.
- *
- * @param da
- *         The darray to check.
- * @return
- *         0 on success, -1 on failure.
- */
-int darray_check(void *da);
-
-/**
- * Free a darray.
- *
- * @param da
- *         The darray to free.
- */
-void darray_free(void *da);
-
-/**
- * Push an item into a darray.
- *
- * @param da
- *         The array to append to.
- * @param item
- *         A pointer to the item to append.
- * @return
- *         0 on success, -1 on failure.
- */
-#define DARRAY_PUSH(da, item) \
-	(darray_check(*(da) = darray_push(*(da), (item), sizeof(**(da) = *(item)))))
-
-#endif // BFS_DARRAY_H
diff --git a/src/main.c b/src/main.c
index b26be85..a05f9c9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -27,7 +27,6 @@
  *     - bfstd.[ch]    (standard library wrappers/polyfills)
  *     - color.[ch]    (for pretty terminal colors)
  *     - config.h      (configuration and feature/platform detection)
- *     - darray.[ch]   (a dynamic array library)
  *     - diag.[ch]     (formats diagnostic messages)
  *     - dir.[ch]      (a directory API facade)
  *     - dstring.[ch]  (a dynamic string library)