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

Use CString::Equals() everywhere.

Browse Source 
* (CString::CaseCmp() == 0) became CString::Equals()
* (CString::CaseCmp() != 0) became !CString::Equals()
* replaced some occurrences of strn?casecmp

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1234 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
kroimon
2008-09-30 15:15:59 +00:00
parent 18ce52e32d
commit 5237a24747
34 changed files with 401 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ZNCString.cpp
View File

@@ -276,13 +276,13 @@ CString CString::AsLower() const {
}
CString::EEscape CString::ToEscape(const CString& sEsc) {
if (sEsc.CaseCmp("ASCII") == 0) {
if (sEsc.Equals("ASCII")) {
return EASCII;
} else if (sEsc.CaseCmp("HTML") == 0) {
} else if (sEsc.Equals("HTML")) {
return EHTML;
} else if (sEsc.CaseCmp("URL") == 0) {
} else if (sEsc.Equals("URL")) {
return EURL;
} else if (sEsc.CaseCmp("SQL") == 0) {
} else if (sEsc.Equals("SQL")) {
return ESQL;
}
@@ -919,7 +919,7 @@ CString CString::ToTimeStr(unsigned long s) {
return sRet.RightChomp_n();
}
bool CString::ToBool() const { return (!Trim_n().Trim_n("0").empty() && Trim_n().CaseCmp("false") != 0); }
bool CString::ToBool() const { return (!Trim_n().Trim_n("0").empty() && !Trim_n().Equals("false")); }
short CString::ToShort() const { return strtoul(this->c_str(), (char**) NULL, 10); }
unsigned short CString::ToUShort() const { return strtoul(this->c_str(), (char**) NULL, 10); }
unsigned int CString::ToUInt() const { return strtoul(this->c_str(), (char**) NULL, 10); }
@@ -976,7 +976,7 @@ CString CString::TrimRight_n(const CString& s) const {
}
bool CString::TrimPrefix(const CString& sPrefix) {
if (CaseCmp(sPrefix, sPrefix.length()) == 0) {
if (Equals(sPrefix, false, sPrefix.length())) {
LeftChomp(sPrefix.length());
return true;
} else {
@@ -985,7 +985,7 @@ bool CString::TrimPrefix(const CString& sPrefix) {
}
bool CString::TrimSuffix(const CString& sSuffix) {
if (Right(sSuffix.length()).CaseCmp(sSuffix) == 0) {
if (Right(sSuffix.length()).Equals(sSuffix)) {
RightChomp(sSuffix.length());
return true;
} else {