summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjacobkeeler <jacob.keeler@livioradio.com>2017-09-21 11:38:10 -0400
committerjacobkeeler <jacob.keeler@livioradio.com>2017-09-21 11:38:10 -0400
commitf70c0f1518b05261018547903903ae2e21c508ac (patch)
tree7557bc0e640b7138020c45d7170c60121d9214f9
parent24b3a361b095da5432366f7cf8d157548c8c5487 (diff)
downloadsdl_core-fix/coverity_issues_4.4.0.tar.gz
-rw-r--r--src/components/application_manager/src/application_manager_impl.cc6
-rw-r--r--src/components/application_manager/test/commands/mobile/show_test.cc6
-rw-r--r--src/components/protocol_handler/include/protocol_handler/protocol_packet.h9
3 files changed, 12 insertions, 9 deletions
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index c419a4dd3f..411813cc83 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -2269,9 +2269,9 @@ bool ApplicationManagerImpl::ConvertSOtoMessage(
if (message.getElement(jhs::S_PARAMS).keyExists(strings::binary_data)) {
application_manager::BinaryData binaryData(
- message.getElement(jhs::S_PARAMS)
- .getElement(strings::binary_data)
- .asBinary());
+ message.getElement(jhs::S_PARAMS)
+ .getElement(strings::binary_data)
+ .asBinary());
output.set_binary_data(&binaryData);
}
diff --git a/src/components/application_manager/test/commands/mobile/show_test.cc b/src/components/application_manager/test/commands/mobile/show_test.cc
index 458d55ac20..d1e3c14181 100644
--- a/src/components/application_manager/test/commands/mobile/show_test.cc
+++ b/src/components/application_manager/test/commands/mobile/show_test.cc
@@ -746,8 +746,8 @@ TEST_F(ShowRequestTest, Run_MainField1_MetadataTagWithNoFieldData) {
event.set_smart_object(*ev_msg);
EXPECT_CALL(mock_message_helper_,
- HMIToMobileResult(hmi_apis::Common_Result::SUCCESS))
- .WillOnce(Return(mobile_apis::Result::SUCCESS));
+ HMIToMobileResult(hmi_apis::Common_Result::SUCCESS))
+ .WillOnce(Return(mobile_apis::Result::SUCCESS));
MessageSharedPtr ui_command_result;
EXPECT_CALL(
@@ -764,7 +764,7 @@ TEST_F(ShowRequestTest, Run_MainField1_MetadataTagWithNoFieldData) {
(*ui_command_result)[am::strings::msg_params][am::strings::result_code]
.asInt(),
static_cast<int32_t>(mobile_apis::Result::WARNINGS));
-
+
Mock::VerifyAndClearExpectations(&mock_message_helper_);
}
diff --git a/src/components/protocol_handler/include/protocol_handler/protocol_packet.h b/src/components/protocol_handler/include/protocol_handler/protocol_packet.h
index 4d9b6e462c..1c427533e6 100644
--- a/src/components/protocol_handler/include/protocol_handler/protocol_packet.h
+++ b/src/components/protocol_handler/include/protocol_handler/protocol_packet.h
@@ -81,11 +81,14 @@ class ProtocolPacket {
uint8_t patchVersion;
static inline int16_t cmp(const ProtocolVersion& version1,
const ProtocolVersion& version2) {
- int16_t diff = static_cast<int16_t>(version1.majorVersion - version2.majorVersion);
+ int16_t diff =
+ static_cast<int16_t>(version1.majorVersion - version2.majorVersion);
if (diff == 0) {
- diff = static_cast<int16_t>(version1.minorVersion - version2.minorVersion);
+ diff =
+ static_cast<int16_t>(version1.minorVersion - version2.minorVersion);
if (diff == 0) {
- diff = static_cast<int16_t>(version1.patchVersion - version2.patchVersion);
+ diff = static_cast<int16_t>(version1.patchVersion -
+ version2.patchVersion);
}
}
return diff;