conf: added config_get_bool()

In contrast to, getBoolConfigParam(), config_get_bool() properly returns a "bool" value. In case of "unset", it returns the default value provided by the caller.

conf: added config_get_bool()
bd0653f4 · Max Kellermann · 910c0009 · bd0653f4 · bd0653f4
Commit bd0653f4 authored Nov 27, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 0 deletions

conf.c src/conf.c +10 -0

conf.h src/conf.h +4 -0

No files found.
--- a/src/conf.c
+++ b/src/conf.c
@@ -418,6 +418,16 @@ int getBoolConfigParam(const char *name, int force)
 	return ret;
 }

+bool config_get_bool(const char *name, bool default_value)
+{
+	int value = getBoolConfigParam(name, true);
+
+	if (value == CONF_BOOL_UNSET)
+		return default_value;
+
+	return value;
+}
+
 int getBoolBlockParam(ConfigParam *param, const char *name, int force)
 {
 	int ret;

--- a/src/conf.h
+++ b/src/conf.h
@@ -19,6 +19,8 @@
 #ifndef MPD_CONF_H
 #define MPD_CONF_H

+#include <stdbool.h>
+
 #define CONF_MUSIC_DIR                  "music_directory"
 #define CONF_PLAYLIST_DIR               "playlist_directory"
 #define CONF_DB_FILE                    "db_file"
@@ -97,6 +99,8 @@ ConfigParam *parseConfigFilePath(const char *name, int force);

 int getBoolConfigParam(const char *name, int force);

+bool config_get_bool(const char *name, bool default_value);
+
 int getBoolBlockParam(ConfigParam *param, const char *name, int force);

 #endif