From: Rafal Krypa <r.krypa@samsung.com>
Date: Tue, 29 Jan 2013 17:19:06 +0000 (+0100)
Subject: Remove some unnecessary code from wrt_set_src_dir() and wrt_set_data_dir().
X-Git-Tag: 2.1b_release~12^2^2~46
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9587bb719ead15f525700f6c1e6026a7892adf99;p=platform%2Fcore%2Fsecurity%2Flibprivilege-control.git

Remove some unnecessary code from wrt_set_src_dir() and wrt_set_data_dir().

[Issue#]       N/A
[Bug]          Widget label constructed, where it is not used.
[Cause]        Only file labels are needed in those functions.
[Solution]     Remove appropriate code blocks.
{Verification] Build.

Change-Id: I3e9c6908c90efc8832f9c93177f371e1e9f5afd2
---

diff --git a/src/privilege-control.c b/src/privilege-control.c
index d203023..2a7c744 100644
--- a/src/privilege-control.c
+++ b/src/privilege-control.c
@@ -639,18 +639,11 @@ API int wrt_set_src_dir(const char* widget_id, const char *path)
 	C_LOGD("Path: %s", path);
 	int ret = PC_OPERATION_SUCCESS;
 #ifdef WRT_SMACK_ENABLED
-	char* widget_label = NULL;
 	char* src_label_dir = NULL;
 	char* src_label_file = NULL;
 
 	ret = PC_ERR_MEM_OPERATION;
 
-	widget_label = wrt_smack_label(widget_id, NULL);
-	if (widget_label == NULL) {
-		C_LOGE("widget_label is NULL");
-		goto out;
-	}
-
 	src_label_dir = wrt_smack_label(widget_id, SMACK_SRC_DIR_SUFFIX);
 	if (src_label_dir == NULL) {
 		C_LOGE("src_label_dir is NULL");
@@ -674,7 +667,6 @@ API int wrt_set_src_dir(const char* widget_id, const char *path)
 	ret = dir_set_smack_r(path, src_label_file, SMACK_LABEL_ACCESS, ~S_IFDIR);
 
 out:
-	free(widget_label);
 	free(src_label_dir);
 	free(src_label_file);
 #endif // WRT_SMACK_ENABLED
@@ -687,7 +679,6 @@ API int wrt_set_data_dir(const char* widget_id, const char *path)
 	C_LOGD("Path: %s", path);
 	int ret = PC_OPERATION_SUCCESS;
 #ifdef WRT_SMACK_ENABLED
-	char* widget_label = NULL;
 	char* data_label = NULL;
 	struct stat st;
 
@@ -722,12 +713,6 @@ API int wrt_set_data_dir(const char* widget_id, const char *path)
 
 	ret = PC_ERR_MEM_OPERATION;
 
-	widget_label = wrt_smack_label(widget_id, NULL);
-	if (widget_label == NULL) {
-		C_LOGE("widget_label is NULL");
-		goto out;
-	}
-
 	data_label = wrt_smack_label(widget_id, SMACK_DATA_SUFFIX);
 	if (data_label == NULL) {
 		C_LOGE("data_label is NULL");
@@ -749,7 +734,6 @@ API int wrt_set_data_dir(const char* widget_id, const char *path)
 	}
 
 out:
-	free(widget_label);
 	free(data_label);
 #endif // WRT_SMACK_ENABLED
 	return ret;