From d81590639331f9b233d3e16512aeb01f5c024a16 Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Sat, 19 Apr 2025 12:47:52 +0100
Subject: Get rid of the internal block wrapper.

This only existed for compatibility with old 2.0 modules and 2.1
has already broken compatibility with them.
---
 modules/operserv/os_config.cpp  | 6 +++---
 modules/operserv/os_defcon.cpp  | 4 ++--
 modules/operserv/os_dns.cpp     | 2 +-
 modules/operserv/os_session.cpp | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'modules/operserv')

diff --git a/modules/operserv/os_config.cpp b/modules/operserv/os_config.cpp
index d889df31e..5417421b6 100644
--- a/modules/operserv/os_config.cpp
+++ b/modules/operserv/os_config.cpp
@@ -33,7 +33,7 @@ public:
 				return;
 			}
 
-			Configuration::MutableBlock *block = Config->GetMutableBlock(params[1]);
+			auto *block = Config->GetMutableBlock(params[1]);
 			if (!block)
 				block = &Config->GetModule(params[1]);
 
@@ -57,7 +57,7 @@ public:
 
 			for (unsigned i = 0; !show_blocks[i].empty(); ++i)
 			{
-				Configuration::Block &block = Config->GetBlock(show_blocks[i]);
+				const auto &block = Config->GetBlock(show_blocks[i]);
 				const Configuration::Block::item_map &items = block.GetItems();
 
 				ListFormatter lflist(source.GetAccount());
@@ -87,7 +87,7 @@ public:
 
 			for (int i = 0; i < Config->CountBlock("module"); ++i)
 			{
-				Configuration::Block &block = Config->GetBlock("module", i);
+				const auto &block = Config->GetBlock("module", i);
 				const Configuration::Block::item_map &items = block.GetItems();
 
 				if (items.size() <= 1)
diff --git a/modules/operserv/os_defcon.cpp b/modules/operserv/os_defcon.cpp
index 0965b0961..9fd47c659 100644
--- a/modules/operserv/os_defcon.cpp
+++ b/modules/operserv/os_defcon.cpp
@@ -338,7 +338,7 @@ public:
 		DefconConfig dconfig;
 
 		{
-		Configuration::Block &block = conf.GetModule(this);
+		const auto &block = conf.GetModule(this);
 		dconfig.defaultlevel = block.Get<int>("defaultlevel");
 		dconfig.defcons[4] = block.Get<const Anope::string>("level4");
 		dconfig.defcons[3] = block.Get<const Anope::string>("level3");
@@ -355,7 +355,7 @@ public:
 		}
 
 		{
-		Configuration::Block &block = conf.GetModule("os_session");
+		const auto &block = conf.GetModule("os_session");
 		dconfig.max_session_kill = block.Get<int>("maxsessionkill");
 		dconfig.session_autokill_expiry = block.Get<time_t>("sessionautokillexpiry");
 		dconfig.sle_reason = block.Get<const Anope::string>("sessionlimitexceeded");
diff --git a/modules/operserv/os_dns.cpp b/modules/operserv/os_dns.cpp
index 9e8a6ac4e..b907bc6fa 100644
--- a/modules/operserv/os_dns.cpp
+++ b/modules/operserv/os_dns.cpp
@@ -780,7 +780,7 @@ public:
 
 	void OnReload(Configuration::Conf &conf) override
 	{
-		Configuration::Block &block = conf.GetModule(this);
+		const auto &block = conf.GetModule(this);
 		this->ttl = block.Get<time_t>("ttl");
 		this->user_drop_mark =  block.Get<int>("user_drop_mark");
 		this->user_drop_time = block.Get<time_t>("user_drop_time");
diff --git a/modules/operserv/os_session.cpp b/modules/operserv/os_session.cpp
index 4920e478e..34e9e7ed0 100644
--- a/modules/operserv/os_session.cpp
+++ b/modules/operserv/os_session.cpp
@@ -640,7 +640,7 @@ public:
 
 	void OnReload(Configuration::Conf &conf) override
 	{
-		Configuration::Block &block = Config->GetModule(this);
+		const auto &block = Config->GetModule(this);
 
 		session_limit = block.Get<int>("defaultsessionlimit");
 		max_session_kill = block.Get<int>("maxsessionkill");
-- 
cgit