aboutsummaryrefslogtreecommitdiffstats
path: root/src/dirvec.h
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-10-08 06:55:10 +0200
committerMax Kellermann <max@duempel.org>2008-10-08 06:55:10 +0200
commit4cfd356e1266ccf4ebb4082ca62e978dc827adc0 (patch)
tree7159de4784159f5ad8b853408aedf5c0f9d83feb /src/dirvec.h
parentb42974eee12414e28157f53b0d7095515b788785 (diff)
downloadmpd-4cfd356e1266ccf4ebb4082ca62e978dc827adc0.tar.gz
mpd-4cfd356e1266ccf4ebb4082ca62e978dc827adc0.tar.xz
mpd-4cfd356e1266ccf4ebb4082ca62e978dc827adc0.zip
dirvec: moved code to dirvec.c
Having all functions as static (non-inline) functions generates GCC warnings, and duplicates binary code across several object files. Most of dirvec's methods are too complex for becoming inline functions. Move them all to dirvec.c and publish the prototypes in dirvec.h.
Diffstat (limited to '')
-rw-r--r--src/dirvec.h67
1 files changed, 5 insertions, 62 deletions
diff --git a/src/dirvec.h b/src/dirvec.h
index 8b2f634e2..94abd681f 100644
--- a/src/dirvec.h
+++ b/src/dirvec.h
@@ -2,72 +2,15 @@
#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 *);
-}
+void dirvec_sort(struct dirvec *dv);
-/* 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);
-}
+Directory *dirvec_find(struct dirvec *dv, const char *path);
-static void dirvec_sort(struct dirvec *dv)
-{
- qsort(dv->base, dv->nr, sizeof(Directory *), dirvec_cmp);
-}
+int dirvec_delete(struct dirvec *dv, Directory *del);
-static Directory *dirvec_find(struct dirvec *dv, const char *path)
-{
- int i;
+void dirvec_add(struct dirvec *dv, Directory *add);
- for (i = dv->nr; --i >= 0; )
- if (!strcmp(dv->base[i]->path, path))
- return dv->base[i];
- return NULL;
-}
+void dirvec_destroy(struct dirvec *dv);
-static int dirvec_delete(struct dirvec *dv, Directory *del)
-{
- 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 */
-}
-
-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;
-}
-
-static void dirvec_destroy(struct dirvec *dv)
-{
- if (dv->base) {
- free(dv->base);
- dv->base = NULL;
- }
- dv->nr = 0;
-}
#endif /* DIRVEC_H */