[datacontrol] - removing warnings after adding the compilation option -Wall

[verification] - code compiles without any error and warning in datacontrol module

Change-Id: Ia29fb6633e8145dda9c06ea9259ec968d1e577a2
Signed-off-by: Andrzej Popowski <a.popowski@samsung.com>

diff --git a/src/datacontrol/datacontrol_instance.cc b/src/datacontrol/datacontrol_instance.cc
index f8d16b23ac9297f12da63e79fd3a8ab86961e746..e071768723c7904cae622e306a12c08ae3d41546 100755 (executable)
--- a/src/datacontrol/datacontrol_instance.cc
+++ b/src/datacontrol/datacontrol_instance.cc
@@ -295,7 +295,6 @@ static void SQLSelectResponseCallback(int requestId, data_control_h handle,
     picojson::array result;
 
     while (data_control_sql_step_next(cursor) == DATA_CONTROL_ERROR_NONE) {
-      int columnSize = 0;
       picojson::object rowData;
       picojson::array columns;
       picojson::array values;
@@ -425,9 +424,7 @@ int DatacontrolInstance::RunMAPDataControlJob(const std::string& providerId,
   data_control_h handle;
 
   SCOPE_EXIT {
-    result = ::data_control_map_destroy(handle);
-    RETURN_IF_FAIL(result,
-                   "Destroying map data control handle is failed with error");
+    ::data_control_map_destroy(handle);
   };
 
   result = ::data_control_map_create(&handle);
@@ -469,9 +466,7 @@ int DatacontrolInstance::RunSQLDataControlJob(const std::string& providerId,
   data_control_h handle;
 
   SCOPE_EXIT {
-    result = ::data_control_sql_destroy(handle);
-    RETURN_IF_FAIL(result,
-                   "Destroying sql data control handle is failed with error");
+    ::data_control_sql_destroy(handle);
   };
 
   result = ::data_control_sql_create(&handle);