config/Global: move config_global_check() to Check.cxx

5 files changed, 86 insertions, 32 deletions

diff --git a/src/Main.cxx b/src/Main.cxx
index 50d496f44..58eb328b4 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -53,6 +53,7 @@
 #include "net/Init.hxx"
 #include "lib/icu/Init.hxx"
 #include "config/Global.hxx"
+#include "config/Check.hxx"
 #include "config/Data.hxx"
 #include "config/Param.hxx"
 #include "config/Path.hxx"
@@ -643,7 +644,7 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
 	}
 #endif
 
-	config_global_check();
+	Check(raw_config);
 
 	/* enable all audio outputs (if not already done by
 	   playlist_state_restore() */
diff --git a/src/config/Check.cxx b/src/config/Check.cxx
new file mode 100644
index 000000000..f68c50247
--- /dev/null
+++ b/src/config/Check.cxx
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2003-2018 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "Check.hxx"
+#include "Data.hxx"
+#include "Domain.hxx"
+#include "Log.hxx"
+
+static void
+Check(const ConfigBlock &block)
+{
+	if (!block.used)
+		/* this whole block was not queried at all -
+		   the feature might be disabled at compile time?
+		   Silently ignore it here. */
+		return;
+
+	for (const auto &i : block.block_params) {
+		if (!i.used)
+			FormatWarning(config_domain,
+				      "option '%s' on line %i was not recognized",
+				      i.name.c_str(), i.line);
+	}
+}
+
+void
+Check(const ConfigData &config_data) noexcept
+{
+	for (const auto &list : config_data.blocks)
+		for (const auto &block : list)
+			Check(block);
+}
diff --git a/src/config/Check.hxx b/src/config/Check.hxx
new file mode 100644
index 000000000..5f23b2198
--- /dev/null
+++ b/src/config/Check.hxx
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2003-2018 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_CONFIG_CHECK_HXX
+#define MPD_CONFIG_CHECK_HXX
+
+#include "Option.hxx"
+#include "Compiler.h"
+
+struct ConfigData;
+
+/**
+ * Call this function after all configuration has been evaluated.  It
+ * checks for unused parameters, and logs warnings.
+ */
+void
+Check(const ConfigData &config_data) noexcept;
+
+#endif
diff --git a/src/config/Global.cxx b/src/config/Global.cxx
index 5892896b9..affdc394b 100644
--- a/src/config/Global.cxx
+++ b/src/config/Global.cxx
@@ -53,30 +53,6 @@ ReadConfigFile(Path path)
 	Migrate(config_data);
 }
 
-static void
-Check(const ConfigBlock &block)
-{
-	if (!block.used)
-		/* this whole block was not queried at all -
-		   the feature might be disabled at compile time?
-		   Silently ignore it here. */
-		return;
-
-	for (const auto &i : block.block_params) {
-		if (!i.used)
-			FormatWarning(config_domain,
-				      "option '%s' on line %i was not recognized",
-				      i.name.c_str(), i.line);
-	}
-}
-
-void config_global_check(void)
-{
-	for (const auto &list : config_data.blocks)
-		for (const auto &block : list)
-			Check(block);
-}
-
 const char *
 config_get_string(ConfigOption option, const char *default_value) noexcept
 {
diff --git a/src/config/Global.hxx b/src/config/Global.hxx
index 630b07e14..7a0cfccde 100644
--- a/src/config/Global.hxx
+++ b/src/config/Global.hxx
@@ -36,13 +36,6 @@ gcc_const
 const ConfigData &
 GetGlobalConfig() noexcept;
 
-/**
- * Call this function after all configuration has been evaluated.  It
- * checks for unused parameters, and logs warnings.
- */
-void
-config_global_check();
-
 void
 ReadConfigFile(Path path);