iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

CString::WildCmp(): add an optional case-sensitivity argument

Browse Source 
It's getting a common pattern to call AsLower() or MakeLower() on
the arguments passed to WildCmp(), we might as well add this for
convenience. It's tempting to make it case-insensitive by default,
since pretty much any IRC related comparison should be, but that
could potentially break some existing code.
This commit is contained in:
J-P Nurmi
2015-02-17 14:45:28 +01:00
parent a8b9542925
commit afaf255246
3 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ZNCString.cpp
View File

@@ -95,9 +95,15 @@ bool CString::Equals(const CString& s, bool bCaseSensitive, CString::size_type u
}
}
bool CString::WildCmp(const CString& sWild, const CString& sString) {
bool CString::WildCmp(const CString& sWild, const CString& sString, CaseSensitivity cs) {
// avoid a copy when cs == CaseSensitive (C++ deliberately specifies that binding
// a temporary object to a reference to const on the stack lengthens the lifetime
// of the temporary to the lifetime of the reference itself)
const CString& sWld = (cs == CaseSensitive ? sWild : sWild.AsLower());
const CString& sStr = (cs == CaseSensitive ? sString : sString.AsLower());
// Written by Jack Handy - jakkhandy@hotmail.com
const char *wild = sWild.c_str(), *CString = sString.c_str();
const char *wild = sWld.c_str(), *CString = sStr.c_str();
const char *cp = NULL, *mp = NULL;
while ((*CString) && (*wild != '*')) {
@@ -133,8 +139,8 @@ bool CString::WildCmp(const CString& sWild, const CString& sString) {
return (*wild == 0);
}
bool CString::WildCmp(const CString& sWild) const {
return CString::WildCmp(sWild, *this);
bool CString::WildCmp(const CString& sWild, CaseSensitivity cs) const {
return CString::WildCmp(sWild, *this, cs);
}
CString& CString::MakeUpper() {