adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-06-26 13:01:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

CString CMessage::GetParams(): keep the colon, even at the beginning

Browse Source
This commit is contained in:
J-P Nurmi
2015-09-06 01:24:23 +02:00
parent 17d07d5a74
commit 2bee156316
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Message.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ CString CMessage::GetParams(unsigned int uIdx, unsigned int uLen) const
unsigned uParams = m_vsParams.size();
for (unsigned int i = uIdx; i < uIdx + uLen; ++i) {
CString sParam = m_vsParams[i];
if (i > uIdx && i == uParams - 1 && (sParam.empty() || sParam.StartsWith(":") || sParam.Contains(" "))) {
if (i == uParams - 1 && (sParam.empty() || sParam.StartsWith(":") || sParam.Contains(" "))) {
sParam = ":" + sParam;
}
vsParams.push_back(sParam);
test/MessageTest.cpp
+3 -3
View File
@@ -51,7 +51,7 @@ TEST(MessageTest, GetParams) {
EXPECT_EQ("", CMessage("CMD").GetParams(-1, 10));
EXPECT_EQ("p1 :p2 p3", CMessage("CMD p1 :p2 p3").GetParams(0));
EXPECT_EQ("p2 p3", CMessage("CMD p1 :p2 p3").GetParams(1));
EXPECT_EQ(":p2 p3", CMessage("CMD p1 :p2 p3").GetParams(1));
EXPECT_EQ("", CMessage("CMD p1 :p2 p3").GetParams(-1));
EXPECT_EQ("", CMessage("CMD p1 :p2 p3").GetParams(0, 0));
@@ -59,11 +59,11 @@ TEST(MessageTest, GetParams) {
EXPECT_EQ("", CMessage("CMD p1 :p2 p3").GetParams(-1, 0));
EXPECT_EQ("p1", CMessage("CMD p1 :p2 p3").GetParams(0, 1));
EXPECT_EQ("p2 p3", CMessage("CMD p1 :p2 p3").GetParams(1, 1));
EXPECT_EQ(":p2 p3", CMessage("CMD p1 :p2 p3").GetParams(1, 1));
EXPECT_EQ("", CMessage("CMD p1 :p2 p3").GetParams(-1, 1));
EXPECT_EQ("p1 :p2 p3", CMessage("CMD p1 :p2 p3").GetParams(0, 10));
EXPECT_EQ("p2 p3", CMessage("CMD p1 :p2 p3").GetParams(1, 10));
EXPECT_EQ(":p2 p3", CMessage("CMD p1 :p2 p3").GetParams(1, 10));
EXPECT_EQ("", CMessage("CMD p1 :p2 p3").GetParams(-1, 10));
}