From: Hongkuk, Son <hongkuk.son@samsung.com>
Date: Wed, 14 Dec 2016 04:49:41 +0000 (+0900)
Subject: d2d-conv-manager: fix svace_2.2 issues
X-Git-Tag: accepted/tizen/common/20161215.165737^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bbee06574487c9d8ea5bf7a196105bf10e0288aa;p=platform%2Fcore%2Fconvergence%2Fd2d-conv-manager.git

d2d-conv-manager: fix svace_2.2 issues

UNINIT.LOCAL_VAR.EX
UNREACHABLE_CODE

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: Ib354678063945081170e66eba20e58297ace2a5d
---

diff --git a/daemon/service_provider/RemoteAppControlServiceProvider.cpp b/daemon/service_provider/RemoteAppControlServiceProvider.cpp
index 059b7fe..3000181 100755
--- a/daemon/service_provider/RemoteAppControlServiceProvider.cpp
+++ b/daemon/service_provider/RemoteAppControlServiceProvider.cpp
@@ -590,10 +590,10 @@ void conv::RemoteAppControlServiceProvider::__iotcon_request_cb(iotcon_resource_
 	return;
 
 CATCH:
-	iotcon_attributes_h attributes;
-	iotcon_representation_h responseRep;
+	iotcon_attributes_h attributes = NULL;
+	iotcon_representation_h responseRep = NULL;
 	iotcon_representation_create(&responseRep);
-	iotcon_attributes_h responseAttributes;
+	iotcon_attributes_h responseAttributes = NULL;
 	iotcon_attributes_create(&responseAttributes);
 
 	if (reqRep != NULL) {
@@ -974,10 +974,7 @@ CATCH:
 		if (appctl_request_char) {
 			payload.set(NULL, CONV_JSON_APP_CONTROL_REQUEST, appctl_request_char);
 		}
-		if (appcontrol_result == IOTCON_ERROR_NONE) {
-			payload.set(NULL, CONV_JSON_APP_CONTROL_RESULT, resultStr.c_str());
-		}
-		payload.set(NULL, CONV_JSON_APP_CONTROL_RESULT, resultStr.c_str());
+
 		result.set(NULL, CONV_JSON_DESCRIPTION, cb_info.requestObj->getDescription());
 		result.set(NULL, CONV_JSON_PAYLOAD, payload);