X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fserver.cpp;h=f22cf1ad4a168f275a9c1d5e96a6debaea771616;hb=fd573d17ca199e87363e95e6a0fd5b1350669fe1;hp=66466fae94cbdbbd65e86566c1526b0370eee561;hpb=5043a2f83598baa3afba53201f690e6deac3eafd;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/server.cpp b/src/server.cpp
index 66466fae9..f22cf1ad4 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -46,13 +46,9 @@ void InspIRCd::Exit(int status)
 #ifdef _WIN32
 	SetServiceStopped(status);
 #endif
-	if (this)
-	{
-		this->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")");
-		this->Cleanup();
-		delete this;
-		ServerInstance = NULL;
-	}
+	this->Cleanup();
+	ServerInstance = NULL;
+	delete this;
 	exit (status);
 }
 
@@ -198,36 +194,34 @@ void ISupportManager::Build()
 	}
 
 	// Transform the map into a list of lines, ready to be sent to clients
-	std::vector<std::string>& lines = this->Lines;
-	std::string line;
+	Numeric::Numeric numeric(RPL_ISUPPORT);
 	unsigned int token_count = 0;
-	lines.clear();
+	cachedlines.clear();
 
 	for (std::map<std::string, std::string>::const_iterator it = tokens.begin(); it != tokens.end(); ++it)
 	{
-		line.append(it->first);
+		numeric.push(it->first);
+		std::string& token = numeric.GetParams().back();
 
 		// If this token has a value then append a '=' char after the name and then the value itself
 		if (!it->second.empty())
-			line.append(1, '=').append(it->second);
+			token.append(1, '=').append(it->second);
 
-		// Always append a space, even if it's the last token because all lines will be suffixed
-		line.push_back(' ');
 		token_count++;
 
 		if (token_count % 13 == 12 || it == --tokens.end())
 		{
 			// Reached maximum number of tokens for this line or the current token
 			// is the last one; finalize the line and store it for later use
-			line.append(":are supported by this server");
-			lines.push_back(line);
-			line.clear();
+			numeric.push("are supported by this server");
+			cachedlines.push_back(numeric);
+			numeric.GetParams().clear();
 		}
 	}
 }
 
 void ISupportManager::SendTo(LocalUser* user)
 {
-	for (std::vector<std::string>::const_iterator i = this->Lines.begin(); i != this->Lines.end(); ++i)
-		user->WriteNumeric(RPL_ISUPPORT, *i);
+	for (std::vector<Numeric::Numeric>::const_iterator i = cachedlines.begin(); i != cachedlines.end(); ++i)
+		user->WriteNumeric(*i);
 }