X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhashcomp.cpp;h=49befd634bcd4df023bd117728cc3a59b96a2643;hb=4487dde76ffbdb21e7dc319b3b87d09c3cf60d8c;hp=4f59f7a5bda85a6e0d2d33111668709a836b3512;hpb=0b304e377df9e12fa00618da1b8e03b4eb377240;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 4f59f7a5b..49befd634 100644
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -245,7 +245,7 @@ irc::sepstream::sepstream(const std::string &source, char seperator) : tokens(so
 	n = tokens.begin();
 }
 
-const std::string irc::sepstream::GetToken()
+bool irc::sepstream::GetToken(std::string &token)
 {
 	std::string::iterator lsp = last_starting_position;
 
@@ -254,18 +254,22 @@ const std::string irc::sepstream::GetToken()
 		if ((*n == sep) || (n+1 == tokens.end()))
 		{
 			last_starting_position = n+1;
-			std::string strip = std::string(lsp, n+1 == tokens.end() ? n+1  : n++);
+			token = std::string(lsp, n+1 == tokens.end() ? n+1  : n++);
 
-			while ((strip.length()) && (strip.find_last_of(sep) == strip.length() - 1))
-				strip.erase(strip.end() - 1);
+			while ((token.length()) && (token.find_last_of(sep) == token.length() - 1))
+				token.erase(token.end() - 1);
+
+			if (token.empty())
+				n++;
 
-			return strip;
+			return n == tokens.end() ? false : true;
 		}
 
 		n++;
 	}
 
-	return "";
+	token = "";
+	return false;
 }
 
 const std::string irc::sepstream::GetRemaining()
@@ -290,18 +294,17 @@ std::string irc::hex(const unsigned char *raw, size_t rawsz)
 	/* EWW! This used to be using sprintf, which is WAY inefficient. -Special */
 	
 	const char *hex = "0123456789abcdef";
-
-	std::string buf;
-	buf.reserve(rawsz * 2);
+	static char hexbuf[MAXBUF];
 
 	size_t i, j;
 	for (i = 0, j = 0; j < rawsz; ++j)
 	{
-		buf[i++] = hex[raw[j] / 16];
-		buf[i++] = hex[raw[j] % 16];
+		hexbuf[i++] = hex[raw[j] / 16];
+		hexbuf[i++] = hex[raw[j] % 16];
 	}
+	hexbuf[i] = 0;
 
-	return buf;
+	return hexbuf;
 }
 
 CoreExport const char* irc::Spacify(const char* n)
@@ -454,16 +457,15 @@ long irc::portparser::GetToken()
 			in_range = 0;
 	}
 
-	std::string x = sep->GetToken();
+	std::string x;
+	sep->GetToken(x);
 
 	if (x.empty())
 		return 0;
 
 	while (Overlaps(atoi(x.c_str())))
 	{
-		x = sep->GetToken();
-
-		if (x.empty())
+		if (!sep->GetToken(x))
 			return 0;
 	}