Merge pull request #607 from SaberUK/master+match

Clean up wildcard code.

2 files changed, 16 insertions, 22 deletions

diff --git a/include/inspircd.h b/include/inspircd.h
index ccb91070e..790e2a0ff 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -546,8 +546,8 @@ class CoreExport InspIRCd
 	 * @param mask The glob pattern to match against.
 	 * @param map The character map to use when matching.
 	 */
-	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);
+	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). If map is null, match will be case insensitive.
@@ -556,8 +556,8 @@ class CoreExport InspIRCd
 	 * @param mask The glob or CIDR pattern to match against.
 	 * @param map The character map to use when matching.
 	 */
-	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);
+	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);
 
 	/** Matches a hostname and IP against a space delimited list of hostmasks.
 	 * @param masks The space delimited masks to match against.
diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 345c822d2..b62fd8a61 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -23,9 +23,10 @@
 #include "hashcomp.h"
 #include "inspstring.h"
 
-static bool match_internal(const unsigned char *str, const unsigned char *mask, unsigned const char *map)
+static bool MatchInternal(const unsigned char* str, const unsigned char* mask, unsigned const char* map)
 {
-	unsigned char *cp = NULL, *mp = NULL;
+	unsigned char* cp = NULL;
+	unsigned char* mp = NULL;
 	unsigned char* string = (unsigned char*)str;
 	unsigned char* wild = (unsigned char*)mask;
 
@@ -72,45 +73,38 @@ static bool match_internal(const unsigned char *str, const unsigned char *mask,
 	return !*wild;
 }
 
-/********************************************************************
- * Below here is all wrappers around match_internal
- ********************************************************************/
+// Below here is all wrappers around MatchInternal
 
-bool InspIRCd::Match(const std::string &str, const std::string &mask, unsigned const char *map)
+bool InspIRCd::Match(const std::string& str, const std::string& mask, unsigned const char* map)
 {
 	if (!map)
 		map = national_case_insensitive_map;
 
-	return match_internal((const unsigned char *)str.c_str(), (const unsigned char *)mask.c_str(), map);
+	return MatchInternal((const unsigned char*)str.c_str(), (const unsigned char*)mask.c_str(), map);
 }
 
-bool InspIRCd::Match(const char *str, const char *mask, unsigned const char *map)
+bool InspIRCd::Match(const char* str, const char* mask, unsigned const char* map)
 {
 	if (!map)
 		map = national_case_insensitive_map;
-	return match_internal((const unsigned char *)str, (const unsigned char *)mask, map);
+
+	return MatchInternal((const unsigned char*)str, (const unsigned char*)mask, map);
 }
 
-bool InspIRCd::MatchCIDR(const std::string &str, const std::string &mask, unsigned const char *map)
+bool InspIRCd::MatchCIDR(const std::string& str, const std::string& mask, unsigned const char* map)
 {
 	if (irc::sockets::MatchCIDR(str, mask, true))
 		return true;
 
-	if (!map)
-		map = national_case_insensitive_map;
-
 	// Fall back to regular match
 	return InspIRCd::Match(str, mask, map);
 }
 
-bool InspIRCd::MatchCIDR(const char *str, const char *mask, unsigned const char *map)
+bool InspIRCd::MatchCIDR(const char* str, const char* mask, unsigned const char* map)
 {
 	if (irc::sockets::MatchCIDR(str, mask, true))
 		return true;
 
-	if (!map)
-		map = national_case_insensitive_map;
-
 	// Fall back to regular match
 	return InspIRCd::Match(str, mask, map);
 }
@@ -121,7 +115,7 @@ bool InspIRCd::MatchMask(const std::string& masks, const std::string& hostname,
 	std::string mask;
 	while (masklist >> mask)
 	{
-		if (InspIRCd::Match(hostname, mask, ascii_case_insensitive_map) || 
+		if (InspIRCd::Match(hostname, mask, ascii_case_insensitive_map) ||
 			InspIRCd::MatchCIDR(ipaddr, mask, ascii_case_insensitive_map))
 		{
 			return true;