Refactor UserManager::DoBackgroundUserStuff().

[user/henk/code/inspircd.git] / src / wildcard.cpp

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index b62fd8a613d1b82802390a1d3178abae290daab9..4a313af760b34e2d7d4443005f4978be990c0ac7 100644 (file)
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -20,8 +20,6 @@
 
 
 #include "inspircd.h"
-#include "hashcomp.h"
-#include "inspstring.h"
 
 static bool MatchInternal(const unsigned char* str, const unsigned char* mask, unsigned const char* map)
 {
@@ -111,9 +109,9 @@ bool InspIRCd::MatchCIDR(const char* str, const char* mask, unsigned const char*
 
 bool InspIRCd::MatchMask(const std::string& masks, const std::string& hostname, const std::string& ipaddr)
 {
-       std::stringstream masklist(masks);
+       irc::spacesepstream masklist(masks);
        std::string mask;
-       while (masklist >> mask)
+       while (masklist.GetToken(mask))
        {
                if (InspIRCd::Match(hostname, mask, ascii_case_insensitive_map) ||
                        InspIRCd::MatchCIDR(ipaddr, mask, ascii_case_insensitive_map))