X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhashcomp.cpp;h=bf2a218a6e8475c7d5a51ea259474b2dfe1232fa;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=6c0ce82b852a62cecb7bf304fdf37bf4eba31de5;hpb=01ce98f2746be837a64f5f9ed2c36eeaabae7462;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 6c0ce82b8..bf2a218a6 100644
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -316,7 +316,7 @@ CoreExport const char* irc::Spacify(const char* n)
 }
 
 
-irc::modestacker::modestacker(InspIRCd* Instance, bool add) : ServerInstance(Instance), adding(add)
+irc::modestacker::modestacker(bool add) : adding(add)
 {
 	sequence.clear();
 	sequence.push_back("");
@@ -343,26 +343,26 @@ void irc::modestacker::PushMinus()
 	this->Push('-',"");
 }
 
-int irc::modestacker::GetStackedLine(std::deque<std::string> &result, int max_line_size)
+int irc::modestacker::GetStackedLine(std::vector<std::string> &result, int max_line_size)
 {
 	if (sequence.empty())
 	{
-		result.clear();
 		return 0;
 	}
 
-	int n = 0;
+	unsigned int n = 0;
 	int size = 1; /* Account for initial +/- char */
 	int nextsize = 0;
-	result.clear();
-	result.push_back(adding ? "+" : "-");
+	int start = result.size();
+	std::string modeline = adding ? "+" : "-";
+	result.push_back(modeline);
 
 	if (sequence.size() > 1)
 		nextsize = sequence[1].length() + 2;
 
-	while (!sequence[0].empty() && (sequence.size() > 1) && (result.size() < ServerInstance->Config->Limits.MaxModes) && ((size + nextsize) < max_line_size))
+	while (!sequence[0].empty() && (sequence.size() > 1) && (n < ServerInstance->Config->Limits.MaxModes) && ((size + nextsize) < max_line_size))
 	{
-		result[0] += *(sequence[0].begin());
+		modeline += *(sequence[0].begin());
 		if (!sequence[1].empty())
 		{
 			result.push_back(sequence[1]);
@@ -376,6 +376,7 @@ int irc::modestacker::GetStackedLine(std::deque<std::string> &result, int max_li
 
 		n++;
 	}
+	result[start] = modeline;
 
 	return n;
 }