Prefer TrimSuffix() over Right() + RightChomp()

This commit is contained in:
J-P Nurmi
2015-08-14 12:31:01 +02:00
parent 475acd8f00
commit 52395fad5e
3 changed files with 4 additions and 10 deletions
+1 -3
View File
@@ -533,9 +533,7 @@ CString CDir::ChangeDir(const CString& sPath, const CString& sAdd, const CString
sAddDir += "/";
CString sCurDir;
if (sRet.Right(1) == "/") {
sRet.RightChomp();
}
sRet.TrimSuffix("/");
for (unsigned int a = 0; a < sAddDir.size(); a++) {
switch (sAddDir[a]) {
+2 -4
View File
@@ -269,10 +269,8 @@ bool CUser::ParseConfig(CConfig* pConfig, CString& sError) {
// Pass = <hash name>#<salted hash>#<salt>#
// 'Salted hash' means hash of 'password' + 'salt'
// Possible hashes are md5 and sha256
if (sValue.Right(1) == "-") {
sValue.RightChomp();
sValue.Trim();
SetPass(sValue, CUser::HASH_MD5);
if (sValue.TrimSuffix("-")) {
SetPass(sValue.Trim_n(), CUser::HASH_MD5);
} else {
CString sMethod = sValue.Token(0, false, "#");
CString sPass = sValue.Token(1, true, "#");
+1 -3
View File
@@ -277,9 +277,7 @@ bool CUtils::GetInput(const CString& sPrompt, CString& sRet, const CString& sDef
}
sInput = szBuf;
if (sInput.Right(1) == "\n") {
sInput.RightChomp();
}
sInput.TrimSuffix("\n");
if (sInput.empty()) {
sRet = sDefault;