diff options
Diffstat (limited to '')
-rw-r--r-- | src/directory.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/directory.h b/src/directory.h index e197600d1..f33d854c6 100644 --- a/src/directory.h +++ b/src/directory.h @@ -26,19 +26,19 @@ #include <stdbool.h> struct dirvec { - struct _Directory **base; + struct directory **base; size_t nr; }; -typedef struct _Directory { +struct directory { char *path; struct dirvec children; struct songvec songs; - struct _Directory *parent; + struct directory *parent; ino_t inode; dev_t device; unsigned stat; /* not needed if ino_t == dev_t == 0 is impossible */ -} Directory; +}; void directory_init(void); @@ -46,26 +46,26 @@ void directory_finish(void); int isRootDirectory(const char *name); -Directory * +struct directory * directory_get_root(void); -Directory * -newDirectory(const char *dirname, Directory * parent); +struct directory * +newDirectory(const char *dirname, struct directory * parent); void -freeDirectory(Directory * directory); +freeDirectory(struct directory * directory); static inline bool -directory_is_empty(Directory *directory) +directory_is_empty(struct directory *directory) { return directory->children.nr == 0 && directory->songs.nr == 0; } -Directory * +struct directory * getDirectory(const char *name); void -sortDirectory(Directory * directory); +sortDirectory(struct directory * directory); int printDirectoryInfo(struct client *client, const char *dirname); @@ -81,7 +81,7 @@ time_t getDbModTime(void); int traverseAllIn(const char *name, int (*forEachSong) (Song *, void *), - int (*forEachDir) (Directory *, void *), void *data); + int (*forEachDir) (struct directory *, void *), void *data); #define getDirectoryPath(dir) ((dir && dir->path) ? dir->path : "") |