From bd11817708a85472c67f727081bc4b3f61f24107 Mon Sep 17 00:00:00 2001 From: Lukasz Kostyra Date: Tue, 23 Jun 2015 11:28:51 +0200 Subject: [PATCH] Fix Klocwork issues [Bug] Issues reported by Klocwork [Cause] N/A [Solution] N/A [Verification] Build, install, run tests Change-Id: I745cccedceff96fc3b1f475da4308f17775a6d24 --- libs/config/from-kvjson-visitor.hpp | 4 ++-- libs/ipc/internals/processor.cpp | 4 ++-- libs/ipc/internals/processor.hpp | 2 +- tests/unit_tests/config/ut-dynvisit.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/config/from-kvjson-visitor.hpp b/libs/config/from-kvjson-visitor.hpp index f9c11ef..943dbb8 100644 --- a/libs/config/from-kvjson-visitor.hpp +++ b/libs/config/from-kvjson-visitor.hpp @@ -212,8 +212,8 @@ private: json_object_put(visitor.mObject); visitor.mObject = nullptr; } - for (int i = 0; i < length; ++i) { - visitor.getValue(i, value[i]); + for (int idx = 0; idx < length; ++idx) { + visitor.getValue(idx, value[idx]); } } diff --git a/libs/ipc/internals/processor.cpp b/libs/ipc/internals/processor.cpp index 9cb86c0..2e7a575 100644 --- a/libs/ipc/internals/processor.cpp +++ b/libs/ipc/internals/processor.cpp @@ -647,7 +647,7 @@ bool Processor::onSendResultRequest(SendResultRequest& request) return false; } -bool Processor::onFinishRequest(FinishRequest& request) +bool Processor::onFinishRequest(FinishRequest& requestFinisher) { LOGS(mLogPrefix + "Processor onFinishRequest"); @@ -686,7 +686,7 @@ bool Processor::onFinishRequest(FinishRequest& request) mIsRunning = false; - request.conditionPtr->notify_all(); + requestFinisher.conditionPtr->notify_all(); return true; } diff --git a/libs/ipc/internals/processor.hpp b/libs/ipc/internals/processor.hpp index 121978c..a0e39bf 100644 --- a/libs/ipc/internals/processor.hpp +++ b/libs/ipc/internals/processor.hpp @@ -466,7 +466,7 @@ private: bool onAddPeerRequest(AddPeerRequest& request); bool onRemovePeerRequest(RemovePeerRequest& request); bool onSendResultRequest(SendResultRequest& request); - bool onFinishRequest(FinishRequest& request); + bool onFinishRequest(FinishRequest& requestFinisher); bool onReturnValue(Peers::iterator& peerIt, const MessageID messageID); diff --git a/tests/unit_tests/config/ut-dynvisit.cpp b/tests/unit_tests/config/ut-dynvisit.cpp index bbe45e0..b2a0372 100644 --- a/tests/unit_tests/config/ut-dynvisit.cpp +++ b/tests/unit_tests/config/ut-dynvisit.cpp @@ -60,7 +60,7 @@ void checkJsonConfig(const TestConfig& cfg, const std::string& json) TestConfig cfg2; loadFromJsonString(json, cfg2); BOOST_CHECK_EQUAL(cfg2.intVal, cfg.intVal); - BOOST_CHECK_EQUAL(cfg.int64Val, cfg.int64Val); + BOOST_CHECK_EQUAL(cfg2.int64Val, cfg.int64Val); BOOST_CHECK_EQUAL(cfg2.boolVal, cfg.boolVal); BOOST_CHECK_EQUAL(cfg2.stringVal, cfg.stringVal); BOOST_CHECK_EQUAL(cfg2.intVector.size(), cfg.intVector.size()); -- 2.7.4