diff options
| author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2006-07-31 12:30:42 +0000 |
|---|---|---|
| committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2006-07-31 12:30:42 +0000 |
| commit | 11376014e3b8395c46366c7395b0daeddef8ceda (patch) | |
| tree | fec4b589282277b7c7a4d85e4125ab43c6e0693d | |
| parent | cfc2715066ba2228a510bb845691b1422e3338de (diff) | |
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
| -rw-r--r-- | include/wildcard.h | 5 | ||||
| -rw-r--r-- | src/wildcard.cpp | 22 |
2 files changed, 8 insertions, 19 deletions
diff --git a/include/wildcard.h b/include/wildcard.h index 3540f3965..936bd9e23 100644 --- a/include/wildcard.h +++ b/include/wildcard.h @@ -14,10 +14,7 @@ * --------------------------------------------------- */ -#include <string> #include "inspircd_config.h" -void Delete(char* str,int pos); -void Insert(char* substr,char* str,int pos); -bool match(const char* literal, const char* mask); +bool match(const char* str, const char* mask); 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); -} - |