1 files changed, 11 insertions, 58 deletions
diff --git a/src/dirvec.h b/src/dirvec.h
index 8b2f634e2..02496cd2b 100644
--- a/src/dirvec.h
+++ b/src/dirvec.h
@@ -1,73 +1,26 @@
 #ifndef DIRVEC_H
 #define DIRVEC_H
 
-#include "directory.h"
 #include "os_compat.h"
-#include "utils.h"
 
-static size_t dv_size(struct dirvec *dv)
-{
-	return dv->nr * sizeof(Directory *);
-}
+struct dirvec {
+	struct directory **base;
+	size_t nr;
+};
 
-/* Only used for sorting/searching a dirvec, not general purpose compares */
-static int dirvec_cmp(const void *d1, const void *d2)
-{
-	const Directory *a = ((const Directory * const *)d1)[0];
-	const Directory *b = ((const Directory * const *)d2)[0];
-	return strcmp(a->path, b->path);
-}
+void dirvec_sort(struct dirvec *dv);
 
-static void dirvec_sort(struct dirvec *dv)
-{
-	qsort(dv->base, dv->nr, sizeof(Directory *), dirvec_cmp);
-}
+struct directory *dirvec_find(const struct dirvec *dv, const char *path);
 
-static Directory *dirvec_find(struct dirvec *dv, const char *path)
-{
-	int i;
+int dirvec_delete(struct dirvec *dv, struct directory *del);
 
-	for (i = dv->nr; --i >= 0; )
-		if (!strcmp(dv->base[i]->path, path))
-			return dv->base[i];
-	return NULL;
-}
+void dirvec_add(struct dirvec *dv, struct directory *add);
 
-static int dirvec_delete(struct dirvec *dv, Directory *del)
+static inline void dirvec_clear(struct dirvec *dv)
 {
-	int i;
-
-	for (i = dv->nr; --i >= 0; ) {
-		if (dv->base[i] != del)
-			continue;
-		/* we _don't_ call freeDirectory() here */
-		if (!--dv->nr) {
-			free(dv->base);
-			dv->base = NULL;
-		} else {
-			memmove(&dv->base[i], &dv->base[i + 1],
-				(dv->nr - i + 1) * sizeof(Directory *));
-			dv->base = xrealloc(dv->base, dv_size(dv));
-		}
-		return i;
-	}
-
-	return -1; /* not found */
+	dv->nr = 0;
 }
 
-static void dirvec_add(struct dirvec *dv, Directory *add)
-{
-	++dv->nr;
-	dv->base = xrealloc(dv->base, dv_size(dv));
-	dv->base[dv->nr - 1] = add;
-}
+void dirvec_destroy(struct dirvec *dv);
 
-static void dirvec_destroy(struct dirvec *dv)
-{
-	if (dv->base) {
-		free(dv->base);
-		dv->base = NULL;
-	}
-	dv->nr = 0;
-}
 #endif /* DIRVEC_H */