Match conversion stuff.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10216 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 8 insertions, 9 deletions

diff --git a/include/inspircd.h b/include/inspircd.h
index 85800f4da..12e22794d 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -713,20 +713,21 @@ class CoreExport InspIRCd : public classbase
 	void SendMode(const std::vector<std::string>& parameters, User *user);
 
 	/** Match two strings using pattern matching, optionally, with a map
-	 * to check case against (may be NULL).
+	 * to check case against (may be NULL). If map is null, match will be case insensitive.
 	 * @param str The literal string to match against
 	 * @param mask The glob pattern to match against.
 	 */
-	static bool Match(const std::string &str, const std::string &mask, unsigned const char *map);
-	static bool Match(const  char *str, const char *mask, unsigned const char *map);
+	static bool Match(const std::string &str, const std::string &mask, unsigned const char *map = NULL);
+	static bool Match(const  char *str, const char *mask, unsigned const char *map = NULL);
 
 	/** Match two strings using pattern matching, optionally, with a map
-	 * to check case against (may be NULL). Supports CIDR patterns as well as globs.
+	 * to check case against (may be NULL). If map is null, match will be case insensitive.
+	 * Supports CIDR patterns as well as globs.
 	 * @param str The literal string to match against
 	 * @param mask The glob or CIDR pattern to match against.
 	 */
-	static bool MatchCIDR(const std::string &str, const std::string &mask, unsigned const char *map);
-	static bool MatchCIDR(const  char *str, const char *mask, unsigned const char *map);
+	static bool MatchCIDR(const std::string &str, const std::string &mask, unsigned const char *map = NULL);
+	static bool MatchCIDR(const  char *str, const char *mask, unsigned const char *map = NULL);
 
 	/** Call the handler for a given command.
 	 * @param commandname The command whos handler you wish to call
diff --git a/include/u_listmode.h b/include/u_listmode.h
index cad52fc12..f98faefd5 100644
--- a/include/u_listmode.h
+++ b/include/u_listmode.h
@@ -14,8 +14,6 @@
 #ifndef INSPIRCD_LISTMODE_PROVIDER
 #define INSPIRCD_LISTMODE_PROVIDER
 
-#include "wildcard.h"
-
 /** Get the time as a string
  */
 inline std::string stringtime()
@@ -284,7 +282,7 @@ class ListModeBase : public ModeHandler
 
 			for (limitlist::iterator it = chanlimits.begin(); it != chanlimits.end(); it++)
 			{
-				if (match(channel->name, it->mask))
+				if (InspIRCd::Match(channel->name, it->mask))
 				{
 					// We have a pattern matching the channel...
 					maxsize = el->size();