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

directory: added directory_is_empty()

Browse Source 
directory_is_empty() is a tiny inline function which determine if a
directory has any child objects (sub directories or songs).
This commit is contained in:
Max Kellermann 2008-10-08 10:48:49 +02:00
parent 7b9bed8398
commit e79aacf1db
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/directory.c
View File

@ -89,7 +89,7 @@ static void deleteEmptyDirectoriesInDirectory(Directory * directory)
for (i = dv->nr; --i >= 0; ) {
deleteEmptyDirectoriesInDirectory(dv->base[i]);
if (!dv->base[i]->children.nr && !dv->base[i]->songs.nr)
if (directory_is_empty(dv->base[i]))
dirvec_delete(dv, dv->base[i]);
}
if (!dv->nr)

8
src/directory.h
View File

@ -23,6 +23,8 @@
#include "songvec.h"
#include "list.h"
#include <stdbool.h>
struct dirvec {
struct _Directory **base;
size_t nr;
@ -53,6 +55,12 @@ newDirectory(const char *dirname, Directory * parent);
void
freeDirectory(Directory * directory);
static inline bool
directory_is_empty(Directory *directory)
{
return directory->children.nr == 0 && directory->songs.nr == 0;
}
Directory *
getDirectory(const char *name);