diff options
author | Eric Wong <normalperson@yhbt.net> | 2008-10-11 23:39:50 -0700 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2008-10-11 23:39:50 -0700 |
commit | 0df62a2c3cb7af88347d40a17cc336b5d1740f62 (patch) | |
tree | 25040833144c3e24f6b4702d9b745cd068b5371a /src/dirvec.h | |
parent | 3456e2de5bf90207d8149a842bb12c3f9bdd218f (diff) | |
parent | 6e2b0ca9edaed200f250ef487701ad161aa4a168 (diff) | |
download | mpd-0df62a2c3cb7af88347d40a17cc336b5d1740f62.tar.gz mpd-0df62a2c3cb7af88347d40a17cc336b5d1740f62.tar.xz mpd-0df62a2c3cb7af88347d40a17cc336b5d1740f62.zip |
Merge branch 'mk/directory'
* mk/directory: (59 commits)
directory: don't use identical struct and variable names
update: replaced update_return with global "modified" flag
update: make the variable "progress" static
update: don't print debug message when song was not modified
update: fix memory leak in directory_update_init()
update: make the job id unsigned
update: job ID must be positive
update: check progress!=IDLE in reap_update_task()
update: fixed stack corruption due to pthread_join() call
updated: always call removeDeletedFromDirectory()
update: eliminated addSubDirectoryToDirectory()
update: make the "song" variable more local
update: do the recursive directory check only once
update: copy stat to new directory
update: avoid duplicate stat() calls
update: rewrote updatePath() using updateInDirectory()
update: don't export updateDirectory()
update: pass const pointer to addSubDirectoryToDirectory()
update: never pass root path to updatePath()
update: merged addDirectoryPathToDB() into addParentPathToDB()
...
Conflicts:
src/song.c
Diffstat (limited to 'src/dirvec.h')
-rw-r--r-- | src/dirvec.h | 69 |
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 */ |