1 files changed, 7 insertions, 10 deletions

diff --git a/lib/libdvec/src/test.c b/lib/libdvec/src/test.c
index d358518..af0ee24 100644
--- a/lib/libdvec/src/test.c
+++ b/lib/libdvec/src/test.c
@@ -7,15 +7,12 @@
 #include <string.h>
 #include <stdlib.h>
 
-#define LIBDVEC_ERR(rc) errx(1, "libdvec: %s", \
-	rc < 0 ? strerror(-rc) : dvec_err[rc])
-
 static const char *dvec_err[] = {
 	DVEC_STRERR_INIT
 };
 
 bool
-str_sort_order(const void *p1, const void *p2, void *user)
+str_sort_order(const void *p1, const void *p2, const void *user)
 {
 	const char *s1 = *(const char **)p1;
 	const char *s2 = *(const char **)p2;
@@ -24,7 +21,7 @@ str_sort_order(const void *p1, const void *p2, void *user)
 }
 
 int
-str_search(const void *p, void *user)
+str_search(const void *p, const void *user)
 {
 	const char *str = *(const char **)p, *cmp = user;
 
@@ -40,18 +37,18 @@ main(int argc, const char **argv)
 	int i, rc;
 
 	rc = dvec_init(&dvec, sizeof(const char *), 16, &stdlib_heap_allocator);
-	if (rc) LIBDVEC_ERR(rc);
+	if (rc) DVEC_ERR(dvec_err, rc);
 
 	for (i = 1; i < argc; i++) {
 		rc = dvec_add_back(&dvec, 1);
-		if (rc) LIBDVEC_ERR(rc);
+		if (rc) DVEC_ERR(dvec_err, rc);
 		val = dvec_back(&dvec);
 		*val = argv[i];
 	}
 
 	rc = dvec_quick_sort_ex(&dvec, &stdlib_heap_allocator, &tmp,
 		false, str_sort_order, NULL);
-	if (rc) LIBDVEC_ERR(rc);
+	if (rc < 0) DVEC_ERR(dvec_err, rc);
 
 	on = dvec_binary_search(&dvec, str_search, "abc", &below, &above);
 
@@ -68,13 +65,13 @@ main(int argc, const char **argv)
 
 	fused = dvec_alloc_fused(sizeof(const char *), 0,
 		&stdlib_heap_allocator, &rc);
-	if (!fused) LIBDVEC_ERR(rc);
+	if (!fused) DVEC_ERR(dvec_err, rc);
 
 	printf("fused: %p %p (+%li)\n", (void *) fused,
 		fused->data, fused->data - (uint8_t *) fused);
 
 	rc = dvec_free(fused);
-	if (rc) LIBDVEC_ERR(rc);
+	if (rc) DVEC_ERR(dvec_err, rc);
 
 	dvec_deinit(&dvec);
 }