* ---------------------------------------------------
*/
+/* $Core: libIRCDhash */
+
#include "inspircd.h"
#include "hashcomp.h"
#ifndef WIN32
return false;
}
+bool irc::tokenstream::GetToken(irc::string &token)
+{
+ std::string stdstring;
+ bool returnval = GetToken(stdstring);
+ token = assign(stdstring);
+ return returnval;
+}
+
+bool irc::tokenstream::GetToken(int &token)
+{
+ std::string tok;
+ bool returnval = GetToken(tok);
+ token = ConvToInt(tok);
+ return returnval;
+}
+
+bool irc::tokenstream::GetToken(long &token)
+{
+ std::string tok;
+ bool returnval = GetToken(tok);
+ token = ConvToInt(tok);
+ return returnval;
+}
+
irc::sepstream::sepstream(const std::string &source, char seperator) : tokens(source), sep(seperator)
{
last_starting_position = tokens.begin();
n = tokens.begin();
}
-const std::string irc::sepstream::GetToken()
+bool irc::sepstream::GetToken(std::string &token)
{
std::string::iterator lsp = last_starting_position;
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()
/* EWW! This used to be using sprintf, which is WAY inefficient. -Special */
const char *hex = "0123456789abcdef";
-
- std::string buf;
- buf.reserve(rawsz * 2 + 1);
+ 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];
}
- buf[i] = '\0';
+ hexbuf[i] = 0;
- return buf;
+ return hexbuf;
}
CoreExport const char* irc::Spacify(const char* n)
if (sequence.size() > 1)
nextsize = sequence[1].length() + 2;
- while (!sequence[0].empty() && (sequence.size() > 1) && (result.size() < MAXMODES+1) && ((size + nextsize) < max_line_size))
+ while (!sequence[0].empty() && (sequence.size() > 1) && (result.size() < MAXMODES) && ((size + nextsize) < max_line_size))
{
result[0] += *(sequence[0].begin());
if (!sequence[1].empty())
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;
}