diff options
| -rw-r--r-- | include/hashcomp.h | 4 | ||||
| -rw-r--r-- | src/hashcomp.cpp | 33 | ||||
| -rw-r--r-- | src/modules/m_alias.cpp | 16 |
3 files changed, 2 insertions, 51 deletions
diff --git a/include/hashcomp.h b/include/hashcomp.h index f3b1ba6e9..1dd1b3b98 100644 --- a/include/hashcomp.h +++ b/include/hashcomp.h @@ -64,10 +64,6 @@ CoreExport extern unsigned const char rfc_case_insensitive_map[256]; */ CoreExport extern unsigned const char ascii_case_insensitive_map[256]; -/** Case sensitive (identity) map. - */ -CoreExport extern unsigned const char rfc_case_sensitive_map[256]; - /** The irc namespace contains a number of helper classes. */ namespace irc diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp index 2c7dca5b1..aa06759a4 100644 --- a/src/hashcomp.cpp +++ b/src/hashcomp.cpp @@ -118,39 +118,6 @@ unsigned const char rfc_case_insensitive_map[256] = { 250, 251, 252, 253, 254, 255, // 250-255 }; -/** - * A case sensitive mapping of characters from upper case to lower case for the - * character set of RFC 1459. This is identical to ASCII. - */ -unsigned const char rfc_case_sensitive_map[256] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, // 0-9 - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, // 10-19 - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, // 20-29 - 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, // 30-39 - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, // 40-49 - 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, // 50-59 - 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, // 60-69 - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, // 70-79 - 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, // 80-89 - 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, // 90-99 - 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, // 100-109 - 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, // 110-119 - 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, // 120-129 - 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, // 130-139 - 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, // 140-149 - 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, // 150-159 - 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, // 160-169 - 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, // 170-179 - 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, // 180-189 - 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, // 190-199 - 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, // 200-209 - 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, // 210-219 - 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, // 220-229 - 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, // 230-239 - 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, // 240-249 - 250, 251, 252, 253, 254, 255, // 250-255 -}; - bool irc::equals(const std::string& s1, const std::string& s2) { const unsigned char* n1 = (const unsigned char*)s1.c_str(); diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index e99d9dab5..6d8e3a1c6 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -42,9 +42,6 @@ class Alias /** Requires oper? */ bool OperOnly; - /* is case sensitive params */ - bool CaseSensitive; - /* whether or not it may be executed via fantasy (default OFF) */ bool ChannelCommand; @@ -94,7 +91,6 @@ class ModuleAlias : public Module a.UserCommand = tag->getBool("usercommand", true); a.OperOnly = tag->getBool("operonly"); a.format = tag->getString("format"); - a.CaseSensitive = tag->getBool("matchcase"); Aliases.insert(std::make_pair(a.AliasedCommand, a)); } } @@ -233,16 +229,8 @@ class ModuleAlias : public Module /* Does it match the pattern? */ if (!a->format.empty()) { - if (a->CaseSensitive) - { - if (!InspIRCd::Match(compare, a->format, rfc_case_sensitive_map)) - return 0; - } - else - { - if (!InspIRCd::Match(compare, a->format)) - return 0; - } + if (!InspIRCd::Match(compare, a->format)) + return 0; } if ((a->OperOnly) && (!user->IsOper())) |