Remove match/wildcmp wrapper which just casts from const char* to char*, do the cast within wildcmp and rename wildcmp to match.

Remove other  casts by casting  directly to unsigned char* first time around


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

1 files changed, 7 insertions, 15 deletions

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 3b95b5f75..aa9f52102 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -34,12 +34,15 @@ extern char lowermap[255];
 // (unattributed to any author) all over the 'net.
 // For now, we'll just consider this public domain.
 
-int wildcmp(char *wild, char *string)
+bool match(const char *str, const char *mask)
 {
-	char *cp, *mp;
+	unsigned char *cp, *mp;
+	unsigned char* string = (unsigned char*)str;
+	unsigned char* wild = (unsigned char*)mask;
+
 	while ((*string) && (*wild != '*'))
 	{
-		if ((lowermap[(unsigned)*wild] != lowermap[(unsigned)*string]) && (*wild != '?'))
+		if ((lowermap[*wild] != lowermap[*string]) && (*wild != '?'))
 		{
 			return 0;
 		}
@@ -59,7 +62,7 @@ int wildcmp(char *wild, char *string)
 			cp = string+1;
 		}
 		else
-		if ((lowermap[(unsigned)*wild] == lowermap[(unsigned)*string]) || (*wild == '?'))
+		if ((lowermap[*wild] == lowermap[*string]) || (*wild == '?'))
 		{
 			wild++;
 			string++;
@@ -80,14 +83,3 @@ int wildcmp(char *wild, char *string)
 	return !*wild;
 }
 
-// This wrapper function is required to convert both
-// strings to 'scandanavian lowercase' and make copies
-// of them to a safe location. It also ensures we don't
-// bite off more than we can chew with the length of
-// the string.
-
-bool match(const char* literal, const char* mask)
-{
-	return wildcmp((char*)mask, (char*)literal);
-}
-