oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

directory: converted typedef Directory to struct directory

Browse Source 
The struct can be forward-declared by other headers, which relaxes the
header dependencies.
This commit is contained in:
Max Kellermann
2008-10-08 10:49:05 +02:00
parent 3c1142cbcb
commit 25f67da58c
11 changed files with 102 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/dirvec.c
View File

@@ -1,26 +1,27 @@
#include "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 *);
return dv->nr * sizeof(struct directory *);
}
/* 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];
const struct directory *a = ((const struct directory * const *)d1)[0];
const struct directory *b = ((const struct directory * const *)d2)[0];
return strcmp(a->path, b->path);
}
void dirvec_sort(struct dirvec *dv)
{
qsort(dv->base, dv->nr, sizeof(Directory *), dirvec_cmp);
qsort(dv->base, dv->nr, sizeof(struct directory *), dirvec_cmp);
}
Directory *dirvec_find(struct dirvec *dv, const char *path)
struct directory *dirvec_find(struct dirvec *dv, const char *path)
{
int i;
@@ -30,7 +31,7 @@ Directory *dirvec_find(struct dirvec *dv, const char *path)
return NULL;
}
int dirvec_delete(struct dirvec *dv, Directory *del)
int dirvec_delete(struct dirvec *dv, struct directory *del)
{
int i;
@@ -43,7 +44,7 @@ int dirvec_delete(struct dirvec *dv, Directory *del)
dv->base = NULL;
} else {
memmove(&dv->base[i], &dv->base[i + 1],
(dv->nr - i + 1) * sizeof(Directory *));
(dv->nr - i + 1) * sizeof(struct directory *));
dv->base = xrealloc(dv->base, dv_size(dv));
}
return i;
@@ -52,7 +53,7 @@ int dirvec_delete(struct dirvec *dv, Directory *del)
return -1; /* not found */
}
void dirvec_add(struct dirvec *dv, Directory *add)
void dirvec_add(struct dirvec *dv, struct directory *add)
{
++dv->nr;
dv->base = xrealloc(dv->base, dv_size(dv));