From 963213132dd923d0e7dbd47ea6f20373cdef343b Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Thu, 24 Jan 2019 17:56:52 +0000
Subject: Fix parsing anticaps mode parameters.

---
 src/modules/m_anticaps.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/modules/m_anticaps.cpp')

diff --git a/src/modules/m_anticaps.cpp b/src/modules/m_anticaps.cpp
index 6cb9b940b..aa605e6ed 100644
--- a/src/modules/m_anticaps.cpp
+++ b/src/modules/m_anticaps.cpp
@@ -34,9 +34,9 @@ class AntiCapsSettings
  public:
 	const AntiCapsMethod method;
 	const uint16_t minlen;
-	const uint8_t percent;
+	const uint16_t percent;
 
-	AntiCapsSettings(const AntiCapsMethod& Method, const uint16_t& MinLen, const uint8_t& Percent)
+	AntiCapsSettings(const AntiCapsMethod& Method, const uint16_t& MinLen, const uint16_t& Percent)
 		: method(Method)
 		, minlen(MinLen)
 		, percent(Percent)
@@ -83,13 +83,13 @@ class AntiCapsMode : public ParamMode<AntiCapsMode, SimpleExtItem<AntiCapsSettin
 		return true;
 	}
 
-	bool ParsePercent(irc::sepstream& stream, uint8_t& percent)
+	bool ParsePercent(irc::sepstream& stream, uint16_t& percent)
 	{
 		std::string percentstr;
 		if (!stream.GetToken(percentstr))
 			return false;
 
-		uint8_t result = ConvToNum<uint8_t>(percentstr);
+		uint16_t result = ConvToNum<uint16_t>(percentstr);
 		if (result < 1 || result > 100)
 			return false;
 
@@ -108,7 +108,7 @@ class AntiCapsMode : public ParamMode<AntiCapsMode, SimpleExtItem<AntiCapsSettin
 		irc::sepstream stream(parameter, ':');
 		AntiCapsMethod method;
 		uint16_t minlen;
-		uint8_t percent;
+		uint16_t percent;
 
 		// Attempt to parse the method.
 		if (!ParseMethod(stream, method) || !ParseMinimumLength(stream, minlen) || !ParsePercent(stream, percent))
-- 
cgit v1.3.1-10-gc9f91


From 5ed970ca7d4e079ca9ff577974572a577c65e823 Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Mon, 28 Jan 2019 10:31:55 +0000
Subject: Fix parsing anticaps mode parameters (again).

It is better to fix the underlying bug than the result of it.

This replaces commit 963213132dd923d0e7dbd47ea6f20373cdef343b.
---
 src/modules/m_anticaps.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/modules/m_anticaps.cpp')

diff --git a/src/modules/m_anticaps.cpp b/src/modules/m_anticaps.cpp
index aa605e6ed..e916edd53 100644
--- a/src/modules/m_anticaps.cpp
+++ b/src/modules/m_anticaps.cpp
@@ -34,9 +34,9 @@ class AntiCapsSettings
  public:
 	const AntiCapsMethod method;
 	const uint16_t minlen;
-	const uint16_t percent;
+	const uint8_t percent;
 
-	AntiCapsSettings(const AntiCapsMethod& Method, const uint16_t& MinLen, const uint16_t& Percent)
+	AntiCapsSettings(const AntiCapsMethod& Method, const uint16_t& MinLen, const uint8_t& Percent)
 		: method(Method)
 		, minlen(MinLen)
 		, percent(Percent)
@@ -83,13 +83,13 @@ class AntiCapsMode : public ParamMode<AntiCapsMode, SimpleExtItem<AntiCapsSettin
 		return true;
 	}
 
-	bool ParsePercent(irc::sepstream& stream, uint16_t& percent)
+	bool ParsePercent(irc::sepstream& stream, uint8_t& percent)
 	{
 		std::string percentstr;
 		if (!stream.GetToken(percentstr))
 			return false;
 
-		uint16_t result = ConvToNum<uint16_t>(percentstr);
+		uint8_t result = ConvToNum<uint8_t>(percentstr);
 		if (result < 1 || result > 100)
 			return false;
 
@@ -108,7 +108,7 @@ class AntiCapsMode : public ParamMode<AntiCapsMode, SimpleExtItem<AntiCapsSettin
 		irc::sepstream stream(parameter, ':');
 		AntiCapsMethod method;
 		uint16_t minlen;
-		uint16_t percent;
+		uint8_t percent;
 
 		// Attempt to parse the method.
 		if (!ParseMethod(stream, method) || !ParseMinimumLength(stream, minlen) || !ParsePercent(stream, percent))
@@ -148,7 +148,7 @@ class AntiCapsMode : public ParamMode<AntiCapsMode, SimpleExtItem<AntiCapsSettin
 		out.push_back(':');
 		out.append(ConvToStr(acs->minlen));
 		out.push_back(':');
-		out.append(ConvToStr(acs->percent));
+		out.append(ConvNumeric(acs->percent));
 	}
 };
 
-- 
cgit v1.3.1-10-gc9f91