From 08ac9c4b05d51f79733b6ad27b7a79240c92fb03 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 9 Oct 2008 15:48:39 +0200 Subject: update: merged addDirectoryPathToDB() into addParentPathToDB() The algorithm in addDirectoryPathToDB() can be simplified further if it is combined with the function addParentPathToDB(). Since there is no other caller of addDirectoryPathToDB(), we can do that. This saves another large stack buffer. --- src/update.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/update.c b/src/update.c index 1415852e0..c2f611e9e 100644 --- a/src/update.c +++ b/src/update.c @@ -338,15 +338,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 (1) { - if ((slash = strchr(slash, '/'))) - *slash = 0; + while ((slash = strchr(slash, '/'))) { + *slash = 0; directory = directory_make_child_checked(directory, duplicated); if (!directory || !slash) @@ -359,25 +358,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; -- cgit v1.2.3