From 2bee156316f8d69ea861f7a95a708918f4fa6758 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sun, 6 Sep 2015 01:24:23 +0200 Subject: [PATCH] CString CMessage::GetParams(): keep the colon, even at the beginning --- src/Message.cpp | 2 +- test/MessageTest.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Message.cpp b/src/Message.cpp index 5538d7fb..5f40fc1b 100644 --- a/src/Message.cpp +++ b/src/Message.cpp @@ -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); diff --git a/test/MessageTest.cpp b/test/MessageTest.cpp index cbcc3c6b..7762018d 100644 --- a/test/MessageTest.cpp +++ b/test/MessageTest.cpp @@ -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)); }