From aa6912f1c9845386180df91b20b6ecd3b78ba4b9 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Thu, 9 Aug 2018 16:33:27 +0100 Subject: Remove the integer overloads of irc::tokenparser::GetToken(). The int overload was never used and the long overload was used in one place. --- src/hashcomp.cpp | 16 ---------------- src/modules/m_filter.cpp | 5 ++++- 2 files changed, 4 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp index 2288a227e..d510e40b1 100644 --- a/src/hashcomp.cpp +++ b/src/hashcomp.cpp @@ -219,22 +219,6 @@ bool irc::tokenstream::GetToken(std::string &token) return true; } -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 separator, bool allowempty) : tokens(source), sep(separator), pos(0), allow_empty(allowempty) { diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp index c039c0455..f7d73ac4a 100644 --- a/src/modules/m_filter.cpp +++ b/src/modules/m_filter.cpp @@ -587,7 +587,10 @@ FilterResult ModuleFilter::DecodeFilter(const std::string &data) if (c != 0) throw ModuleException("Invalid flag: '" + std::string(1, c) + "'"); - tokens.GetToken(res.duration); + std::string duration; + tokens.GetToken(duration); + res.duration = ConvToInt(duration); + tokens.GetToken(res.reason); /* Hax to allow spaces in the freeform without changing the design of the irc protocol */ -- cgit v1.2.3