aboutsummaryrefslogtreecommitdiffstats
path: root/src/config/ConfigGlobal.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'src/config/ConfigGlobal.hxx')
-rw-r--r--src/config/ConfigGlobal.hxx21
1 files changed, 15 insertions, 6 deletions
diff --git a/src/config/ConfigGlobal.hxx b/src/config/ConfigGlobal.hxx
index 831418d03..9e8687e82 100644
--- a/src/config/ConfigGlobal.hxx
+++ b/src/config/ConfigGlobal.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@@ -27,15 +27,20 @@ class Error;
class Path;
class AllocatedPath;
struct config_param;
+struct ConfigBlock;
-void config_global_init(void);
-void config_global_finish(void);
+void
+config_global_init();
+
+void
+config_global_finish();
/**
* Call this function after all configuration has been evaluated. It
* checks for unused parameters, and logs warnings.
*/
-void config_global_check(void);
+void
+config_global_check();
bool
ReadConfigFile(Path path, Error &error);
@@ -44,6 +49,10 @@ gcc_pure
const config_param *
config_get_param(enum ConfigOption option);
+gcc_pure
+const ConfigBlock *
+config_get_block(enum ConfigBlockOption option);
+
/**
* Find a block with a matching attribute.
*
@@ -52,8 +61,8 @@ config_get_param(enum ConfigOption option);
* @param value the expected attribute value
*/
gcc_pure
-const config_param *
-config_find_block(ConfigOption option, const char *key, const char *value);
+const ConfigBlock *
+config_find_block(ConfigBlockOption option, const char *key, const char *value);
/* Note on gcc_pure: Some of the functions declared pure are not
really pure in strict sense. They have side effect such that they