From f5edfa1a93af9a8692d45d076a2f45cc25d33d94 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 9 Oct 2008 15:37:18 +0200 Subject: directory: don't query database during load Don't use db_get_directory() and traverse the full path with every directory being loaded. Just see if the current parent contains the entry. Everything else would be invalid anyway.. --- src/directory_save.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/directory_save.c b/src/directory_save.c index cd79e178b..76eace90b 100644 --- a/src/directory_save.c +++ b/src/directory_save.c @@ -18,7 +18,6 @@ #include "directory_save.h" #include "directory.h" -#include "database.h" #include "song.h" #include "log.h" #include "path.h" @@ -105,7 +104,7 @@ void directory_load(FILE * fp, struct directory * directory) FATAL("Wrong path in database: '%s' in '%s'\n", name, directory->path); - if ((subdir = db_get_directory(name))) { + if ((subdir = directory_get_child(directory, name))) { assert(subdir->parent == directory); } else { subdir = directory_new(name, directory); -- cgit v1.2.3