ConfigData: move struct block_param to Block.?xx

5 files changed, 114 insertions, 61 deletions

diff --git a/Makefile.am b/Makefile.am
index bb6a0c53f..1cd6b1bf6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -770,6 +770,7 @@ libconf_a_SOURCES = \
 	src/config/ConfigDefaults.hxx \
 	src/config/ConfigPath.cxx src/config/ConfigPath.hxx \
 	src/config/ConfigData.cxx src/config/ConfigData.hxx \
+	src/config/Block.cxx src/config/Block.hxx \
 	src/config/ConfigParser.cxx src/config/ConfigParser.hxx \
 	src/config/ConfigGlobal.cxx src/config/ConfigGlobal.hxx \
 	src/config/ConfigFile.cxx src/config/ConfigFile.hxx \
diff --git a/src/config/Block.cxx b/src/config/Block.cxx
new file mode 100644
index 000000000..ff5a426f8
--- /dev/null
+++ b/src/config/Block.cxx
@@ -0,0 +1,59 @@
+/*
+ * 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
+ * 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 "Block.hxx"
+#include "ConfigParser.hxx"
+#include "system/FatalError.hxx"
+
+#include <stdlib.h>
+
+int
+block_param::GetIntValue() const
+{
+	char *endptr;
+	long value2 = strtol(value.c_str(), &endptr, 0);
+	if (*endptr != 0)
+		FormatFatalError("Not a valid number in line %i", line);
+
+	return value2;
+}
+
+unsigned
+block_param::GetUnsignedValue() const
+{
+	char *endptr;
+	unsigned long value2 = strtoul(value.c_str(), &endptr, 0);
+	if (*endptr != 0)
+		FormatFatalError("Not a valid number in line %i", line);
+
+	return (unsigned)value2;
+}
+
+bool
+block_param::GetBoolValue() const
+{
+	bool value2;
+	if (!get_bool(value.c_str(), &value2))
+		FormatFatalError("%s is not a boolean value (yes, true, 1) or "
+				 "(no, false, 0) on line %i\n",
+				 name.c_str(), line);
+
+	return value2;
+}
diff --git a/src/config/Block.hxx b/src/config/Block.hxx
new file mode 100644
index 000000000..1295c7289
--- /dev/null
+++ b/src/config/Block.hxx
@@ -0,0 +1,53 @@
+/*
+ * 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
+ * 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_BLOCK_HXX
+#define MPD_CONFIG_BLOCK_HXX
+
+#include "check.h"
+#include "Compiler.h"
+
+#include <string>
+
+struct block_param {
+	std::string name;
+	std::string value;
+	int line;
+
+	/**
+	 * This flag is false when nobody has queried the value of
+	 * this option yet.
+	 */
+	mutable bool used;
+
+	gcc_nonnull_all
+	block_param(const char *_name, const char *_value, int _line=-1)
+		:name(_name), value(_value), line(_line), used(false) {}
+
+	gcc_pure
+	int GetIntValue() const;
+
+	gcc_pure
+	unsigned GetUnsignedValue() const;
+
+	gcc_pure
+	bool GetBoolValue() const;
+};
+
+#endif
diff --git a/src/config/ConfigData.cxx b/src/config/ConfigData.cxx
index 95c54a294..42f93972c 100644
--- a/src/config/ConfigData.cxx
+++ b/src/config/ConfigData.cxx
@@ -19,49 +19,13 @@
 
 #include "config.h"
 #include "ConfigData.hxx"
-#include "ConfigParser.hxx"
 #include "ConfigPath.hxx"
 #include "util/Error.hxx"
 #include "fs/AllocatedPath.hxx"
-#include "system/FatalError.hxx"
 
 #include <assert.h>
 #include <stdlib.h>
 
-int
-block_param::GetIntValue() const
-{
-	char *endptr;
-	long value2 = strtol(value.c_str(), &endptr, 0);
-	if (*endptr != 0)
-		FormatFatalError("Not a valid number in line %i", line);
-
-	return value2;
-}
-
-unsigned
-block_param::GetUnsignedValue() const
-{
-	char *endptr;
-	unsigned long value2 = strtoul(value.c_str(), &endptr, 0);
-	if (*endptr != 0)
-		FormatFatalError("Not a valid number in line %i", line);
-
-	return (unsigned)value2;
-}
-
-bool
-block_param::GetBoolValue() const
-{
-	bool value2;
-	if (!get_bool(value.c_str(), &value2))
-		FormatFatalError("%s is not a boolean value (yes, true, 1) or "
-				 "(no, false, 0) on line %i\n",
-				 name.c_str(), line);
-
-	return value2;
-}
-
 config_param::config_param(const char *_value, int _line)
 	:next(nullptr), value(_value), line(_line), used(false) {}
 
diff --git a/src/config/ConfigData.hxx b/src/config/ConfigData.hxx
index e794c044f..332634646 100644
--- a/src/config/ConfigData.hxx
+++ b/src/config/ConfigData.hxx
@@ -20,6 +20,7 @@
 #ifndef MPD_CONFIG_DATA_HXX
 #define MPD_CONFIG_DATA_HXX
 
+#include "Block.hxx"
 #include "ConfigOption.hxx"
 #include "Compiler.h"
 
@@ -30,31 +31,6 @@
 class AllocatedPath;
 class Error;
 
-struct block_param {
-	std::string name;
-	std::string value;
-	int line;
-
-	/**
-	 * This flag is false when nobody has queried the value of
-	 * this option yet.
-	 */
-	mutable bool used;
-
-	gcc_nonnull_all
-	block_param(const char *_name, const char *_value, int _line=-1)
-		:name(_name), value(_value), line(_line), used(false) {}
-
-	gcc_pure
-	int GetIntValue() const;
-
-	gcc_pure
-	unsigned GetUnsignedValue() const;
-
-	gcc_pure
-	bool GetBoolValue() const;
-};
-
 struct config_param {
 	/**
 	 * The next config_param with the same name.  The destructor