summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@tavianator.com>2022-03-06 11:27:09 -0500
committerTavian Barnes <tavianator@tavianator.com>2022-03-09 08:57:56 -0500
commit701a55cdd57501ea3309028b80916cb6dcc41d0f (patch)
tree52186d556e30f26aa3b4fd0fddcb3bc096daf2a0
parentbc9e94b898fb680b5391434f75b0434156cef638 (diff)
downloadbfs-701a55cdd57501ea3309028b80916cb6dcc41d0f.tar.xz
Revert "darray: New DARRAY_POP() macro"
This reverts commit 6ac4deb451ccd4ed11fb0d022b83710b5b0522fe.
-rw-r--r--darray.c9
-rw-r--r--darray.h23
2 files changed, 0 insertions, 32 deletions
diff --git a/darray.c b/darray.c
index 8f796d6..6585d30 100644
--- a/darray.c
+++ b/darray.c
@@ -15,7 +15,6 @@
****************************************************************************/
#include "darray.h"
-#include <assert.h>
#include <stdlib.h>
#include <string.h>
@@ -97,14 +96,6 @@ int darray_check(void *da) {
}
}
-size_t darray_pop(void *da) {
- assert(da);
-
- struct darray *header = darray_header(da);
- assert(header->length > 0);
- return --header->length;
-}
-
void darray_free(void *da) {
if (da) {
free(darray_header(da));
diff --git a/darray.h b/darray.h
index e2d0e10..4464381 100644
--- a/darray.h
+++ b/darray.h
@@ -87,18 +87,6 @@ void *darray_push(void *da, const void *item, size_t size);
int darray_check(void *da);
/**
- * @internal Use DARRAY_POP().
- *
- * Pop an element from an array.
- *
- * @param da
- * The array in question.
- * @return
- * The (new) length of the array.
- */
-size_t darray_pop(void *da);
-
-/**
* Free a darray.
*
* @param da
@@ -119,15 +107,4 @@ void darray_free(void *da);
#define DARRAY_PUSH(da, item) \
(darray_check(*(da) = darray_push(*(da), (item), sizeof(**(da) = *(item)))))
-/**
- * Pop an item from a darray.
- *
- * @param da
- * The array to pop from.
- * @return
- * The popped item.
- */
-#define DARRAY_POP(da) \
- ((da)[darray_pop((da))])
-
#endif // BFS_DARRAY_H