From: hb.min <hb.min@samsung.com>
Date: Thu, 27 Jun 2013 13:01:49 +0000 (+0900)
Subject: Fix build error on GCC 4.8
X-Git-Tag: submit/tizen/20130828.070518^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ab6c918efc7aa4418b642948af98cde03e63cd0;p=platform%2Fcore%2Fsecurity%2Fprivilege-checker.git

Fix build error on GCC 4.8

Change-Id: I7858c8fb0c732f6f70820ba130330b003430fde9
Signed-off-by: hb.min <hb.min@samsung.com>
---

diff --git a/capi/src/privilege_info.c b/capi/src/privilege_info.c
index 1b95359..81d8b03 100644
--- a/capi/src/privilege_info.c
+++ b/capi/src/privilege_info.c
@@ -175,8 +175,6 @@ int privilege_info_get_privilege_group_display_name_by_string_id(const char *str
 int privilege_info_get_name_string_id(const char *privilege, char **name_string_id)
 {
 	int index = 0;
-	bool validStringFlag = false;
-
 	TryReturn(privilege != NULL, PRVMGR_ERR_INVALID_PARAMETER, "[PRVMGR_ERR_INVALID_PARAMETER] privilege is NULL");
 
 	for (index = 0; index < PRIVILEGE_NUM; index++)
@@ -187,7 +185,6 @@ int privilege_info_get_name_string_id(const char *privilege, char **name_string_
 			TryReturn(*name_string_id != NULL, PRVMGR_ERR_OUT_OF_MEMORY, "[PRVMGR_ERR_OUT_OF_MEMORY] Memory allocation failed.");
 
 			memcpy(*name_string_id, privilege_info_table[index].name_string_id, strlen(privilege_info_table[index].name_string_id));
-			validStringFlag = true;
 			break;
 		}
 	}
@@ -248,8 +245,6 @@ int privilege_info_get_privilege_display_name(const char *privilege, char **name
 int privilege_info_get_description_string_id(const char *privilege, char **description_string_id)
 {
 	int index = 0;
-	bool validStringFlag = false;
-
 	TryReturn(privilege != NULL, PRVMGR_ERR_INVALID_PARAMETER, "[PRVMGR_ERR_INVALID_PARAMETER] privilege is NULL");
 
 	for (index = 0; index < PRIVILEGE_NUM; index++)
@@ -260,7 +255,6 @@ int privilege_info_get_description_string_id(const char *privilege, char **descr
 			TryReturn(*description_string_id != NULL, PRVMGR_ERR_OUT_OF_MEMORY, "[PRVMGR_ERR_OUT_OF_MEMORY] Memory allocation failed.");
 
 			memcpy(*description_string_id, privilege_info_table[index].description_string_id, strlen(privilege_info_table[index].description_string_id));
-			validStringFlag = true;
 			break;
 		}
 	}
diff --git a/util/src/DbManager.cpp b/util/src/DbManager.cpp
index 66c0807..540efdc 100644
--- a/util/src/DbManager.cpp
+++ b/util/src/DbManager.cpp
@@ -227,7 +227,7 @@ DbManager::DeletePrivacy(const PrivacyInfo* pPrivacyInfo)
 	TryReturn(dbRes == SQLITE_DONE, res = PRIV_CHECKER_ERROR_DB_ERROR, PRIV_CHECKER_ERROR_DB_ERROR, "[%s] DB step failed. (%d)", Util::GetErrorMessage(PRIV_CHECKER_ERROR_DB_ERROR), dbRes);
 
 	LOGI("leave");
-	return 0;
+	return res;
 }
 
 int