X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhashcomp.cpp;h=35e5f3671cec15aa37c1387bfc460a6eaf54eb76;hb=7770cd985405c7630e9149fc08c314ec824a9c75;hp=895b500ae8c8d94cfeb341a0cc14242b2499dce0;hpb=f62654a6859998f9d63eb22702c572d5ebcff15c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 895b500ae..35e5f3671 100644
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -153,7 +153,7 @@ unsigned const char rfc_case_sensitive_map[256] = {
 
 size_t CoreExport irc::hash::operator()(const irc::string &s) const
 {
-	register size_t t = 0;
+	size_t t = 0;
 	for (irc::string::const_iterator x = s.begin(); x != s.end(); ++x) /* ++x not x++, as its faster */
 		t = 5 * t + national_case_insensitive_map[(unsigned char)*x];
 	return t;
@@ -196,7 +196,7 @@ size_t irc::insensitive::operator()(const std::string &s) const
 	 * only with *x replaced with national_case_insensitive_map[*x].
 	 * This avoids a copy to use hash<const char*>
 	 */
-	register size_t t = 0;
+	size_t t = 0;
 	for (std::string::const_iterator x = s.begin(); x != s.end(); ++x) /* ++x not x++, as its faster */
 		t = 5 * t + national_case_insensitive_map[(unsigned char)*x];
 	return t;
@@ -268,7 +268,7 @@ bool irc::tokenstream::GetToken(std::string &token)
 	/* This is the last parameter */
 	if (token[0] == ':' && !first)
 	{
-		token = token.substr(1);
+		token.erase(token.begin());
 		if (!StreamEnd())
 		{
 			token += ' ';
@@ -332,7 +332,7 @@ bool irc::sepstream::GetToken(std::string &token)
 	if (p == std::string::npos)
 		p = this->tokens.length();
 
-	token = this->tokens.substr(this->pos, p - this->pos);
+	token.assign(tokens, this->pos, p - this->pos);
 	this->pos = p + 1;
 
 	return true;
@@ -348,71 +348,6 @@ bool irc::sepstream::StreamEnd()
 	return this->pos > this->tokens.length();
 }
 
-irc::modestacker::modestacker(bool add) : adding(add)
-{
-	sequence.clear();
-	sequence.push_back("");
-}
-
-void irc::modestacker::Push(char modeletter, const std::string &parameter)
-{
-	*(sequence.begin()) += modeletter;
-	sequence.push_back(parameter);
-}
-
-void irc::modestacker::Push(char modeletter)
-{
-	this->Push(modeletter,"");
-}
-
-void irc::modestacker::PushPlus()
-{
-	this->Push('+',"");
-}
-
-void irc::modestacker::PushMinus()
-{
-	this->Push('-',"");
-}
-
-int irc::modestacker::GetStackedLine(std::vector<std::string> &result, int max_line_size)
-{
-	if (sequence.empty())
-	{
-		return 0;
-	}
-
-	unsigned int n = 0;
-	int size = 1; /* Account for initial +/- char */
-	int nextsize = 0;
-	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) && (n < ServerInstance->Config->Limits.MaxModes) && ((size + nextsize) < max_line_size))
-	{
-		modeline += *(sequence[0].begin());
-		if (!sequence[1].empty())
-		{
-			result.push_back(sequence[1]);
-			size += nextsize; /* Account for mode character and whitespace */
-		}
-		sequence[0].erase(sequence[0].begin());
-		sequence.erase(sequence.begin() + 1);
-
-		if (sequence.size() > 1)
-			nextsize = sequence[1].length() + 2;
-
-		n++;
-	}
-	result[start] = modeline;
-
-	return n;
-}
-
 std::string irc::stringjoiner(const std::vector<std::string>& sequence, char separator)
 {
 	std::string joined;
@@ -477,10 +412,9 @@ long irc::portparser::GetToken()
 	std::string::size_type dash = x.rfind('-');
 	if (dash != std::string::npos)
 	{
-		std::string sbegin = x.substr(0, dash);
-		std::string send = x.substr(dash+1, x.length());
+		std::string sbegin(x, 0, dash);
 		range_begin = atoi(sbegin.c_str());
-		range_end = atoi(send.c_str());
+		range_end = atoi(x.c_str()+dash+1);
 
 		if ((range_begin > 0) && (range_end > 0) && (range_begin < 65536) && (range_end < 65536) && (range_begin < range_end))
 		{