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

update: eliminated addSubDirectoryToDirectory()

Browse Source 
In updateInDirectory(), add new directories immediately and
delete them when they turn out to be empty.  This simplifies the code
and allows us to eliminate addSubDirectoryToDirectory().
This commit is contained in:
Max Kellermann 2008-10-09 19:17:25 +02:00
parent 9604f88fe7
commit 84b52265a6
1 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/update.c
View File

@ -229,23 +229,6 @@ inodeFoundInParent(struct directory *parent, ino_t inode, dev_t device)
static enum update_return static enum update_return
updateDirectory(struct directory *directory, const struct stat *st); updateDirectory(struct directory *directory, const struct stat *st);
static enum update_return
addSubDirectoryToDirectory(struct directory *directory,
const char *name, const struct stat *st)
{
struct directory *subDirectory;
subDirectory = directory_new(name, directory);
if (updateDirectory(subDirectory, st) != UPDATE_RETURN_UPDATED) {
directory_free(subDirectory);
return UPDATE_RETURN_NOUPDATE;
}
dirvec_add(&directory->children, subDirectory);
return UPDATE_RETURN_UPDATED;
}
static enum update_return static enum update_return
updateInDirectory(struct directory *directory, updateInDirectory(struct directory *directory,
const char *name, const struct stat *st) const char *name, const struct stat *st)
@ -270,24 +253,22 @@ updateInDirectory(struct directory *directory,
} }
} else if (S_ISDIR(st->st_mode)) { } else if (S_ISDIR(st->st_mode)) {
struct directory *subdir; struct directory *subdir;
enum update_return ret;
if (inodeFoundInParent(directory, st->st_ino, st->st_dev)) if (inodeFoundInParent(directory, st->st_ino, st->st_dev))
return UPDATE_RETURN_ERROR; return UPDATE_RETURN_ERROR;
subdir = directory_get_child(directory, name); subdir = directory_get_child(directory, name);
if (subdir) { if (subdir == NULL)
enum update_return ret; subdir = directory_new_child(directory, name);
assert(directory == subdir->parent); assert(directory == subdir->parent);
ret = updateDirectory(subdir, st); ret = updateDirectory(subdir, st);
if (ret == UPDATE_RETURN_ERROR) if (ret == UPDATE_RETURN_ERROR || directory_is_empty(subdir))
delete_directory(subdir); delete_directory(subdir);
return ret; return ret;
} else {
return addSubDirectoryToDirectory(directory, name, st);
}
} }
DEBUG("update: %s is not a directory or music\n", name); DEBUG("update: %s is not a directory or music\n", name);