diff options
-rw-r--r-- | src/update.c | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/src/update.c b/src/update.c index d8bbc02d0..b9bc3ffd5 100644 --- a/src/update.c +++ b/src/update.c @@ -352,16 +352,14 @@ directory_make_child_checked(struct directory *parent, const char *path) } static struct directory * -addDirectoryPathToDB(const char *utf8path) +addParentPathToDB(const char *utf8path) { struct directory *directory = db_get_root(); char *duplicated = xstrdup(utf8path); char *slash = duplicated; - while (true) { - slash = strchr(slash, '/'); - if (slash != NULL) - *slash = 0; + while ((slash = strchr(slash, '/')) != NULL) { + *slash = 0; directory = directory_make_child_checked(directory, duplicated); @@ -375,26 +373,6 @@ addDirectoryPathToDB(const char *utf8path) return directory; } -static struct directory * -addParentPathToDB(const char *utf8path) -{ - char *parent; - char path_max_tmp[MPD_PATH_MAX]; - struct directory *parentDirectory; - - parent = parent_path(path_max_tmp, utf8path); - - if (strlen(parent) == 0) - parentDirectory = db_get_root(); - else - parentDirectory = addDirectoryPathToDB(parent); - - if (!parentDirectory) - return NULL; - - return (struct directory *) parentDirectory; -} - static enum update_return updatePath(const char *utf8path) { struct directory *directory; |