From 4fa5538e2bed36903b403e1aaee2462d22b456dc Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 21 Jan 2015 22:13:44 +0100
Subject: config/Param: split block-specific attributes to new struct
 ConfigBlock

The old struct config_param remains only for top-level string options.
---
 src/neighbor/Glue.cxx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/neighbor/Glue.cxx')

diff --git a/src/neighbor/Glue.cxx b/src/neighbor/Glue.cxx
index 57383b1d5..4d5d7b4b0 100644
--- a/src/neighbor/Glue.cxx
+++ b/src/neighbor/Glue.cxx
@@ -24,8 +24,8 @@
 #include "NeighborPlugin.hxx"
 #include "Info.hxx"
 #include "config/ConfigGlobal.hxx"
-#include "config/Param.hxx"
 #include "config/ConfigError.hxx"
+#include "config/Block.hxx"
 #include "util/Error.hxx"
 
 NeighborGlue::Explorer::~Explorer()
@@ -37,9 +37,9 @@ NeighborGlue::~NeighborGlue() {}
 
 static NeighborExplorer *
 CreateNeighborExplorer(EventLoop &loop, NeighborListener &listener,
-		       const config_param &param, Error &error)
+		       const ConfigBlock &block, Error &error)
 {
-	const char *plugin_name = param.GetBlockValue("plugin");
+	const char *plugin_name = block.GetBlockValue("plugin");
 	if (plugin_name == nullptr) {
 		error.Set(config_domain,
 			  "Missing \"plugin\" configuration");
@@ -53,18 +53,18 @@ CreateNeighborExplorer(EventLoop &loop, NeighborListener &listener,
 		return nullptr;
 	}
 
-	return plugin->create(loop, listener, param, error);
+	return plugin->create(loop, listener, block, error);
 }
 
 bool
 NeighborGlue::Init(EventLoop &loop, NeighborListener &listener, Error &error)
 {
-	for (const auto *param = config_get_param(ConfigOption::NEIGHBORS);
-	     param != nullptr; param = param->next) {
+	for (const auto *block = config_get_block(ConfigBlockOption::NEIGHBORS);
+	     block != nullptr; block = block->next) {
 		NeighborExplorer *explorer =
-			CreateNeighborExplorer(loop, listener, *param, error);
+			CreateNeighborExplorer(loop, listener, *block, error);
 		if (explorer == nullptr) {
-			error.FormatPrefix("Line %i: ", param->line);
+			error.FormatPrefix("Line %i: ", block->line);
 			return false;
 		}
 
-- 
cgit v1.2.3