From 9c6b2a32f510778252f3a9c79725334aaec4d80b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 18 Jan 2009 17:54:46 +0100 Subject: conf: added config_get_path() config_get_path() is an simpler interface than parseConfigFilePath(). --- src/main.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index 9b1203a92..c7f9e9987 100644 --- a/src/main.c +++ b/src/main.c @@ -81,19 +81,20 @@ struct notify main_notify; static void openDB(Options * options, char *argv0) { - struct config_param *param; + const char *path = config_get_path(CONF_DB_FILE); - param = parseConfigFilePath(CONF_DB_FILE, - mapper_has_music_directory()); if (!mapper_has_music_directory()) { - if (param != NULL) + if (path != NULL) g_message("Found " CONF_DB_FILE " setting without " CONF_MUSIC_DIR " - disabling database"); db_init(NULL); return; } - db_init(param->value); + if (path == NULL) + g_error(CONF_DB_FILE " setting missing"); + + db_init(path); if (options->createDB > 0 || !db_load()) { unsigned job; -- cgit v1.2.3