Patch from DukePyrolator to replace all calls to match_wild() and match_wild_nocase() to use Anope::Match() instead. Also changes line-endings on wildcard.cpp to Unix-style, as well as fixes a small compile warning in language.c.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2080 5417fbe8-f217-4b02-8779-1006273d7864

1 files changed, 81 insertions, 81 deletions

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 65916d038..b66b8b29c 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -1,81 +1,81 @@
-#include "services.h"

-

-static bool match_internal(const unsigned char *str, const unsigned char *mask, bool case_sensitive)

-{

-	unsigned char *cp = NULL, *mp = NULL;

-	unsigned char* string = (unsigned char*)str;

-	unsigned char* wild = (unsigned char*)mask;

-

-	while ((*string) && (*wild != '*'))

-	{

-		if (case_sensitive)

-		{

-			if (*wild != *string && *wild != '?')

-				return false;

-		}

-		else

-		{

-			if (tolower(*wild) != tolower(*string) && *wild != '?')

-				return false;

-		}

-

-		wild++;

-		string++;

-	}

-

-	while (*string)

-	{

-		if (*wild == '*')

-		{

-			if (!*++wild)

-			{

-				return 1;

-			}

-

-			mp = wild;

-			cp = string+1;

-		}

-		else

-		{

-			if (case_sensitive)

-			{

-				if (*wild == *string || *wild == '?')

-				{

-					wild++;

-					string++;

-				}

-				else

-				{

-					wild = mp;

-					string = cp++;

-				}

-			}

-			else

-			{

-				if (tolower(*wild) == tolower(*string) || *wild == '?')

-				{

-					wild++;

-					string++;

-				}

-				else

-				{

-					wild = mp;

-					string = cp++;

-				}

-			}

-		}

-

-	}

-

-	while (*wild == '*')

-	{

-		wild++;

-	}

-

-	return !*wild;

-}

-

-CoreExport bool Anope::Match(const std::string &str, const std::string &mask, bool case_sensitive)

-{

-	return match_internal((const unsigned char *)str.c_str(), (const unsigned char *)mask.c_str(), case_sensitive);

-}

+#include "services.h"
+
+static bool match_internal(const unsigned char *str, const unsigned char *mask, bool case_sensitive)
+{
+	unsigned char *cp = NULL, *mp = NULL;
+	unsigned char* string = (unsigned char*)str;
+	unsigned char* wild = (unsigned char*)mask;
+
+	while ((*string) && (*wild != '*'))
+	{
+		if (case_sensitive)
+		{
+			if (*wild != *string && *wild != '?')
+				return false;
+		}
+		else
+		{
+			if (tolower(*wild) != tolower(*string) && *wild != '?')
+				return false;
+		}
+
+		wild++;
+		string++;
+	}
+
+	while (*string)
+	{
+		if (*wild == '*')
+		{
+			if (!*++wild)
+			{
+				return 1;
+			}
+
+			mp = wild;
+			cp = string+1;
+		}
+		else
+		{
+			if (case_sensitive)
+			{
+				if (*wild == *string || *wild == '?')
+				{
+					wild++;
+					string++;
+				}
+				else
+				{
+					wild = mp;
+					string = cp++;
+				}
+			}
+			else
+			{
+				if (tolower(*wild) == tolower(*string) || *wild == '?')
+				{
+					wild++;
+					string++;
+				}
+				else
+				{
+					wild = mp;
+					string = cp++;
+				}
+			}
+		}
+
+	}
+
+	while (*wild == '*')
+	{
+		wild++;
+	}
+
+	return !*wild;
+}
+
+CoreExport bool Anope::Match(const std::string &str, const std::string &mask, bool case_sensitive)
+{
+	return match_internal((const unsigned char *)str.c_str(), (const unsigned char *)mask.c_str(), case_sensitive);
+}