diff options
| author | 2021-04-04 23:42:15 +0100 | |
|---|---|---|
| committer | 2021-04-04 23:42:15 +0100 | |
| commit | 7d84e4900fa8f4ef96e8cf4bb67b76be7902e840 (patch) | |
| tree | f5a81d03f572392e7547d58f979fdd488de6ff0b /src/wildcard.cpp | |
| parent | Remove the unused ExitCodes array. (diff) | |
Fix a ton of pedantic compiler warnings.
Diffstat (limited to 'src/wildcard.cpp')
| -rw-r--r-- | src/wildcard.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/wildcard.cpp b/src/wildcard.cpp index f9e706906..364051cf1 100644 --- a/src/wildcard.cpp +++ b/src/wildcard.cpp @@ -26,10 +26,10 @@ static bool MatchInternal(const unsigned char* str, const unsigned char* mask, unsigned const char* map) { - unsigned char* cp = NULL; - unsigned char* mp = NULL; - unsigned char* string = (unsigned char*)str; - unsigned char* wild = (unsigned char*)mask; + const unsigned char* cp = nullptr; + const unsigned char* mp = nullptr; + const unsigned char* string = reinterpret_cast<const unsigned char*>(str); + const unsigned char* wild = reinterpret_cast<const unsigned char*>(mask); while ((*string) && (*wild != '*')) { @@ -81,7 +81,7 @@ bool InspIRCd::Match(const std::string& str, const std::string& mask, unsigned c if (!map) map = national_case_insensitive_map; - return MatchInternal((const unsigned char*)str.c_str(), (const unsigned char*)mask.c_str(), map); + return MatchInternal(reinterpret_cast<const unsigned char*>(str.c_str()), reinterpret_cast<const unsigned char*>(mask.c_str()), map); } bool InspIRCd::Match(const char* str, const char* mask, unsigned const char* map) @@ -89,7 +89,7 @@ bool InspIRCd::Match(const char* str, const char* mask, unsigned const char* map if (!map) map = national_case_insensitive_map; - return MatchInternal((const unsigned char*)str, (const unsigned char*)mask, map); + return MatchInternal(reinterpret_cast<const unsigned char*>(str), reinterpret_cast<const unsigned char*>(mask), map); } bool InspIRCd::MatchCIDR(const std::string& str, const std::string& mask, unsigned const char* map) |
