From 65cd631b2a6a15f615b3a8519bfe024271e01284 Mon Sep 17 00:00:00 2001 From: Yunjin Lee Date: Fri, 13 Jan 2017 16:12:51 +0900 Subject: [PATCH] Remove negative symbol from return value - Error enum was modified to negative value hence no need to return error enum with negative symbol Change-Id: I4c359d5389be4344d07936505679186ce082422c Signed-off-by: Yunjin Lee --- capi/src/privilege_db_manager.c | 10 +++++----- capi/src/privilege_manager.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/capi/src/privilege_db_manager.c b/capi/src/privilege_db_manager.c index 434c3ac..5dc8f6c 100755 --- a/capi/src/privilege_db_manager.c +++ b/capi/src/privilege_db_manager.c @@ -159,7 +159,7 @@ int privilege_db_manager_check_black_list(int uid, privilege_db_manager_package_ ret = __initialize_db(PRIVILEGE_DB_TYPE_POLICY_RO, &db, package_type); if (ret != PRIVILEGE_DB_MANAGER_ERR_NONE) { _LOGE("db initialize failed. ret = %d", ret); - return -ret; + return ret; } char *privilege_list_str = NULL; @@ -167,13 +167,13 @@ int privilege_db_manager_check_black_list(int uid, privilege_db_manager_package_ _LOGD("check black list with uid = %d, package_type = %d, privilege_list = %s", uid, package_type, privilege_list_str); char *sql = sqlite3_mprintf("select distinct privilege_name from prevent_list where privilege_name in(%s)and uid=%d and package_type=%d", privilege_list_str, uid, package_type); sqlite3_free(privilege_list_str); - TryReturn(sql != NULL, __finalize_db(db, stmt, sql), -PRIVILEGE_DB_MANAGER_ERR_INVALID_QUERY, "[DB_FAIL] sqlite3_mprintf failed"); + TryReturn(sql != NULL, __finalize_db(db, stmt, sql), PRIVILEGE_DB_MANAGER_ERR_INVALID_QUERY, "[DB_FAIL] sqlite3_mprintf failed"); ret = sqlite3_prepare_v2(db, sql, strlen(sql), &stmt, NULL); if (ret != SQLITE_OK) { _LOGE("[DB_FAIL] fail to prepare database : %s", sqlite3_errmsg(db)); __finalize_db(db, stmt, sql); - return -PRIVILEGE_DB_MANAGER_ERR_INVALID_QUERY; + return PRIVILEGE_DB_MANAGER_ERR_INVALID_QUERY; } do { @@ -479,9 +479,9 @@ int privilege_db_manager_is(char type, const char* privilege) TryReturn(ret == PRIVILEGE_DB_MANAGER_ERR_NONE, , ret, "[PRIVILEGE_DB_MANAGER] DB INITIALIZE FAIL"); char *sql = sqlite3_mprintf("select privilege_name,is_privacy, is_internal from valid_privilege_info where privilege_name=%Q", privilege); - TryReturn(sql != NULL, __finalize_db(db, stmt, sql), -PRIVILEGE_DB_MANAGER_ERR_INVALID_QUERY, "[DB_FAIL] sqlite3_mprintf failed"); + TryReturn(sql != NULL, __finalize_db(db, stmt, sql), PRIVILEGE_DB_MANAGER_ERR_INVALID_QUERY, "[DB_FAIL] sqlite3_mprintf failed"); ret = sqlite3_prepare_v2(db, sql, strlen(sql), &stmt, NULL); - TryReturn(ret == SQLITE_OK, __finalize_db(db, stmt, sql), -PRIVILEGE_DB_MANAGER_ERR_INVALID_QUERY, "[DB_FAIL] fail to prepare database : %s", sqlite3_errmsg(db)); + TryReturn(ret == SQLITE_OK, __finalize_db(db, stmt, sql), PRIVILEGE_DB_MANAGER_ERR_INVALID_QUERY, "[DB_FAIL] fail to prepare database : %s", sqlite3_errmsg(db)); ret = sqlite3_step(stmt); if (ret == SQLITE_ROW) { diff --git a/capi/src/privilege_manager.c b/capi/src/privilege_manager.c index a3ef4f2..fc7ce6b 100755 --- a/capi/src/privilege_manager.c +++ b/capi/src/privilege_manager.c @@ -272,7 +272,7 @@ int privilege_manager_verify_privilege(uid_t uid, const char *api_version, privi /* Check black list */ ret = privilege_db_manager_check_black_list(uid, package_type, privilege_list); - if (ret == -PRIVILEGE_DB_MANAGER_ERR_DB_NOENTRY) { + if (ret == PRIVILEGE_DB_MANAGER_ERR_DB_NOENTRY) { _LOGE("[FAIL TO CALL FUNCTION] black list policy db cannot be found"); } else if (ret > 0) { *error_message = strdup("[PRVMGR_ERR_USING_BANNED_PRIVILEGE] Application manifest contains banned privilege(s) declared by the DPM"); -- 2.7.4