diff options
| author |  Sadie Powell | 2022-03-27 15:33:31 +0100 |
|---|---|---|
| committer | Sadie Powell | 2022-03-27 15:41:28 +0100 |
| commit | ed6e19bbd06cdec2a9d75e4c2c338d47d759eecf (patch) | |
| tree | 29d90503a51c54eafd0ba87bd34b961908d45b48 /include | |
| parent | Merge branch 'insp3' into master. (diff) | |
Fix unsigned/const keyword ordering, remove unnecessary consts.
Diffstat (limited to 'include')
| -rw-r--r-- | include/hashcomp.h | 4 | ||||
| -rw-r--r-- | include/inspircd.h | 8 | ||||
| -rw-r--r-- | include/mode.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/include/hashcomp.h b/include/hashcomp.h index 10ebd312e..24e66cfc9 100644 --- a/include/hashcomp.h +++ b/include/hashcomp.h @@ -49,13 +49,13 @@ * This is provided as a pointer so that modules can change it to their custom mapping tables, * e.g. for national character support. */ -CoreExport extern unsigned const char *national_case_insensitive_map; +CoreExport extern const unsigned char* national_case_insensitive_map; /** Case insensitive map, ASCII rules. * That is; * [ != {, but A == a. */ -CoreExport extern unsigned const char ascii_case_insensitive_map[256]; +CoreExport extern const unsigned char ascii_case_insensitive_map[256]; /** The irc namespace contains a number of helper classes. */ diff --git a/include/inspircd.h b/include/inspircd.h index 3baaa9626..65f6ef133 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -388,8 +388,8 @@ public: * @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, const unsigned char* map = NULL); + static bool Match(const char* str, const char* mask, const unsigned 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. @@ -398,8 +398,8 @@ public: * @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, const unsigned char* map = NULL); + static bool MatchCIDR(const char* str, const char* mask, const unsigned 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/include/mode.h b/include/mode.h index cbc57d57b..1d7437b9c 100644 --- a/include/mode.h +++ b/include/mode.h @@ -775,7 +775,7 @@ public: * @param mt type of mode to search for, user or channel * @returns a pointer to a ModeHandler class, or NULL of there isn't a handler for the given mode */ - ModeHandler* FindMode(unsigned const char modeletter, ModeType mt); + ModeHandler* FindMode(unsigned char modeletter, ModeType mt); /** Find the mode handler for the given prefix mode * @param modeletter The mode letter to search for @@ -788,7 +788,7 @@ public: * @param pfxletter The prefix to find, e.g. '@' * @return The mode handler which handles this prefix, or NULL if there is none. */ - PrefixMode* FindPrefix(unsigned const char pfxletter); + PrefixMode* FindPrefix(unsigned char pfxletter); /** Get a list of all mode handlers that inherit from ListModeBase * @return A list containing ListModeBase modes |