X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fserver.cpp;h=c2068d75bb169e4e084f30734c5848137afba6e7;hb=4ab1c43c1eee708fc50a4808f714a731891b75e8;hp=c49e17b565a8549f0cb3b093138b4c511b483b21;hpb=0a9f710e25f22fa67276aa8d15a008a5341b0f2a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/server.cpp b/src/server.cpp
index c49e17b56..c2068d75b 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -66,17 +66,11 @@ void RehashHandler::Call(const std::string &reason)
 	}
 }
 
-std::string InspIRCd::GetVersionString(bool operstring)
+std::string InspIRCd::GetVersionString(bool getFullVersion)
 {
-	char versiondata[MAXBUF];
-	if (operstring)
-	{
-		std::string sename = SE->GetName();
-		snprintf(versiondata,MAXBUF,"%s %s :%s [%s,%s,%s]",VERSION, Config->ServerName.c_str(), SYSTEM,REVISION, sename.c_str(), Config->sid.c_str());
-	}
-	else
-		snprintf(versiondata,MAXBUF,"%s %s :%s",BRANCH,Config->ServerName.c_str(),Config->CustomVersion.c_str());
-	return versiondata;
+	if (getFullVersion)
+		return VERSION " " + Config->ServerName + " :" SYSTEM " [" REVISION "," + SE->GetName() + "," + Config->sid + "]";
+	return BRANCH " " + Config->ServerName + " :" + Config->CustomVersion;
 }
 
 const char InspIRCd::LogHeader[] =
@@ -143,15 +137,10 @@ void UIDGenerator::init(const std::string& sid)
 	 *		-- w
 	 */
 
+	current_uid.resize(UUID_LENGTH, '9');
 	current_uid[0] = sid[0];
 	current_uid[1] = sid[1];
 	current_uid[2] = sid[2];
-
-	for (int i = 3; i < (UUID_LENGTH - 1); i++)
-		current_uid[i] = '9';
-
-	// Null terminator. Important.
-	current_uid[UUID_LENGTH - 1] = '\0';
 }
 
 /*
@@ -162,7 +151,7 @@ std::string UIDGenerator::GetUID()
 	while (1)
 	{
 		// Add one to the last UID
-		this->IncrementUID(UUID_LENGTH - 2);
+		this->IncrementUID(UUID_LENGTH - 1);
 
 		if (!ServerInstance->FindUUID(current_uid))
 			break;