From 15a9f661e8cf0755364028bd29521b9f5041d987 Mon Sep 17 00:00:00 2001
From: Anna Niznik <a.niznik@samsung.com>
Date: Tue, 21 Jul 2015 14:25:42 +0200
Subject: [PATCH] Removing warnings from modules: filesystem,
 humanactivitymonitor, keymanager, mediacontroller, messageport. Using
 cppcheck (with --enable=all flag).

[Verification] TCT result:
Before:
[filesystem]      100.00%
[mediacontroller] 100.00%
[messageport]     58.33%
After:
[filesystem]      100.00%
[mediacontroller] 100.00%
[messageport]     58.33%

Change-Id: Ic432cca30647544a11c6fe5ee7038372c9deae9e
Signed-off-by: Anna Niznik <a.niznik@samsung.com>
---
 src/filesystem/filesystem_utils.cc                       | 3 +--
 src/humanactivitymonitor/humanactivitymonitor_manager.cc | 9 +++------
 src/keymanager/keymanager_instance.cc                    | 2 +-
 src/mediacontroller/mediacontroller_types.cc             | 3 +--
 src/messageport/messageport_instance.cc                  | 2 +-
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/filesystem/filesystem_utils.cc b/src/filesystem/filesystem_utils.cc
index c288935..7bc374d 100755
--- a/src/filesystem/filesystem_utils.cc
+++ b/src/filesystem/filesystem_utils.cc
@@ -22,9 +22,8 @@
 namespace FilesystemUtils {
 std::string get_storage_dir_path(int id, storage_directory_e typeToCheck) {
   LoggerD("Enter");
-  int result = STORAGE_ERROR_NONE;
   char* platformPath = NULL;
-  result = storage_get_directory(id, typeToCheck, &platformPath);
+  int result = storage_get_directory(id, typeToCheck, &platformPath);
   if (result != STORAGE_ERROR_NONE) {
     LoggerD("Cannot retrieve path for type %i", typeToCheck);
     return std::string();
diff --git a/src/humanactivitymonitor/humanactivitymonitor_manager.cc b/src/humanactivitymonitor/humanactivitymonitor_manager.cc
index b0700e3..b666e09 100755
--- a/src/humanactivitymonitor/humanactivitymonitor_manager.cc
+++ b/src/humanactivitymonitor/humanactivitymonitor_manager.cc
@@ -193,10 +193,9 @@ PlatformResult HumanActivityMonitorManager::SetWristUpListener(
 
 PlatformResult HumanActivityMonitorManager::UnsetWristUpListener() {
   LoggerD("Enter");
-  int ret;
 
   if (gesture_handle_) {
-    ret = gesture_stop_recognition(gesture_handle_);
+    int ret = gesture_stop_recognition(gesture_handle_);
     if (ret != GESTURE_ERROR_NONE) {
       LOGGER(ERROR) << "Failed to stop WRIST_UP detection, error: " << ret;
     }
@@ -275,10 +274,9 @@ PlatformResult HumanActivityMonitorManager::SetHrmListener(
 
 PlatformResult HumanActivityMonitorManager::UnsetHrmListener() {
   LoggerD("Enter");
-  int ret;
 
   if (hrm_sensor_listener_) {
-    ret = sensor_listener_stop(hrm_sensor_listener_);
+    int ret = sensor_listener_stop(hrm_sensor_listener_);
     if (ret != SENSOR_ERROR_NONE) {
       LOGGER(ERROR) << "Failed to stop HRM sensor, error: " << ret;
       return PlatformResult(ErrorCode::UNKNOWN_ERR,
@@ -421,10 +419,9 @@ PlatformResult HumanActivityMonitorManager::SetGpsListener(
 
 PlatformResult HumanActivityMonitorManager::UnsetGpsListener() {
   LoggerD("Enter");
-  int ret;
 
   if (location_handle_) {
-    ret = location_manager_stop_batch(location_handle_);
+    int ret = location_manager_stop_batch(location_handle_);
     if (ret != LOCATIONS_ERROR_NONE) {
       LOGGER(ERROR) << "Failed to stop location manager, error: " << ret;
       return PlatformResult(ErrorCode::UNKNOWN_ERR,
diff --git a/src/keymanager/keymanager_instance.cc b/src/keymanager/keymanager_instance.cc
index 9829df4..07fa332 100755
--- a/src/keymanager/keymanager_instance.cc
+++ b/src/keymanager/keymanager_instance.cc
@@ -742,7 +742,7 @@ void KeyManagerInstance::SaveData(const picojson::value& args,
       common::tools::ReportError(success, &result->get<picojson::object>());
     }
 
-    delete data;
+    delete[] data;
   };
 
   auto save_data_result = [this, callback_id](const std::shared_ptr<picojson::value>& result) {
diff --git a/src/mediacontroller/mediacontroller_types.cc b/src/mediacontroller/mediacontroller_types.cc
index b6c194c..0cb9c77 100755
--- a/src/mediacontroller/mediacontroller_types.cc
+++ b/src/mediacontroller/mediacontroller_types.cc
@@ -200,9 +200,8 @@ PlatformResult Types::ConvertMetadata(mc_metadata_h metadata_h,
     free(value);
   };
 
-  int ret;
   for (auto& field : metadata_fields) {
-    ret = mc_client_get_metadata(metadata_h,
+    int ret = mc_client_get_metadata(metadata_h,
                                  static_cast<mc_meta_e>(field.second),
                                  &value);
     if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
diff --git a/src/messageport/messageport_instance.cc b/src/messageport/messageport_instance.cc
index 8ef03b0..abf702e 100755
--- a/src/messageport/messageport_instance.cc
+++ b/src/messageport/messageport_instance.cc
@@ -322,7 +322,7 @@ void MessageportInstance::RemoteMessagePortSendmessage
   bundle* bundle = bundle_create();
 
   for (picojson::value::array::iterator it = data.begin();
-       it != data.end(); it++) {
+       it != data.end(); ++it) {
       bundle_add(bundle, (*it).get("key").to_str().c_str(),
         (*it).get("value").to_str().c_str());
   }
-- 
2.7.4