diff options
| author | Vincent Richard <[email protected]> | 2021-11-25 20:57:07 +0000 |
|---|---|---|
| committer | Vincent Richard <[email protected]> | 2021-11-25 20:57:07 +0000 |
| commit | 23ab2a6a3c927c99bfc1a0bedd94e283c05ca59d (patch) | |
| tree | f4e9bb240ca211db15f4a8f51404bde3befc1480 | |
| parent | #268 Code style fixes + moved specific bits to IMAP namespace (diff) | |
| download | vmime-23ab2a6a3c927c99bfc1a0bedd94e283c05ca59d.tar.gz vmime-23ab2a6a3c927c99bfc1a0bedd94e283c05ca59d.zip | |
Fixed Cppcheck issues.
| -rw-r--r-- | src/vmime/net/folder.cpp | 15 | ||||
| -rw-r--r-- | src/vmime/text.cpp | 3 | ||||
| -rw-r--r-- | tests/net/smtp/SMTPTransportTestUtils.hpp | 1 | ||||
| -rw-r--r-- | tests/testUtils.hpp | 2 |
4 files changed, 15 insertions, 6 deletions
diff --git a/src/vmime/net/folder.cpp b/src/vmime/net/folder.cpp index 6e01b602..75b10042 100644 --- a/src/vmime/net/folder.cpp +++ b/src/vmime/net/folder.cpp @@ -56,7 +56,10 @@ void folder::addMessageChangedListener(events::messageChangedListener* l) { void folder::removeMessageChangedListener(events::messageChangedListener* l) { - std::remove(m_messageChangedListeners.begin(), m_messageChangedListeners.end(), l); + m_messageChangedListeners.erase( + std::remove(m_messageChangedListeners.begin(), m_messageChangedListeners.end(), l), + m_messageChangedListeners.end() + ); } @@ -78,7 +81,10 @@ void folder::addMessageCountListener(events::messageCountListener* l) { void folder::removeMessageCountListener(events::messageCountListener* l) { - std::remove(m_messageCountListeners.begin(), m_messageCountListeners.end(), l); + m_messageCountListeners.erase( + std::remove(m_messageCountListeners.begin(), m_messageCountListeners.end(), l), + m_messageCountListeners.end() + ); } @@ -100,7 +106,10 @@ void folder::addFolderListener(events::folderListener* l) { void folder::removeFolderListener(events::folderListener* l) { - std::remove(m_folderListeners.begin(), m_folderListeners.end(), l); + m_folderListeners.erase( + std::remove(m_folderListeners.begin(), m_folderListeners.end(), l), + m_folderListeners.end() + ); } diff --git a/src/vmime/text.cpp b/src/vmime/text.cpp index 86ba44f1..123ce007 100644 --- a/src/vmime/text.cpp +++ b/src/vmime/text.cpp @@ -269,7 +269,6 @@ shared_ptr <text> text::newFromString(const string& in, const charset& ch) { void text::createFromString(const string& in, const charset& ch) { - size_t asciiCount = 0; size_t asciiPercent = 0; removeAllWords(); @@ -282,7 +281,7 @@ void text::createFromString(const string& in, const charset& ch) { const bool alwaysEncode = ch.getRecommendedEncoding(recommendedEnc); if (!alwaysEncode) { - asciiCount = utility::stringUtils::countASCIIchars(in.begin(), in.end()); + const auto asciiCount = utility::stringUtils::countASCIIchars(in.begin(), in.end()); asciiPercent = (in.length() == 0 ? 100 : (100 * asciiCount) / in.length()); } diff --git a/tests/net/smtp/SMTPTransportTestUtils.hpp b/tests/net/smtp/SMTPTransportTestUtils.hpp index 8710639f..c0d4e54f 100644 --- a/tests/net/smtp/SMTPTransportTestUtils.hpp +++ b/tests/net/smtp/SMTPTransportTestUtils.hpp @@ -241,6 +241,7 @@ public: m_state = STATE_NOT_CONNECTED; m_bdatChunkCount = 0; + m_bdatChunkSize = m_bdatChunkReceived = 0; m_ehloSent = m_mailSent = m_rcptSent = m_quitSent = false; } diff --git a/tests/testUtils.hpp b/tests/testUtils.hpp index f625dec0..06ddb3e2 100644 --- a/tests/testUtils.hpp +++ b/tests/testUtils.hpp @@ -93,7 +93,7 @@ namespace CppUnit { // Work-around for comparing 'std::string' against 'char*' inline void assertEquals( const char* expected, - const std::string actual, + const std::string &actual, SourceLine sourceLine, const std::string &message ) { |