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

update: merged addDirectoryPathToDB() into addParentPathToDB()

Browse Source 
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.
This commit is contained in:
Max Kellermann 2008-10-09 15:48:39 +02:00
parent 4990f04ac0
commit a79bd723e2
1 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/update.c
View File

@ -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;