Remove negative symbol from return value 83/110183/1 accepted/tizen/3.0/common/20170118.130738 accepted/tizen/3.0/ivi/20170118.042546 accepted/tizen/3.0/mobile/20170118.042459 accepted/tizen/3.0/tv/20170118.042520 accepted/tizen/3.0/wearable/20170118.042531 accepted/tizen/common/20170116.181529 accepted/tizen/ivi/20170117.053524 accepted/tizen/mobile/20170117.053435 accepted/tizen/tv/20170117.053453 accepted/tizen/wearable/20170117.053506 submit/tizen/20170116.051423 submit/tizen_3.0/20170115.225845
authorYunjin Lee <yunjin-.lee@samsung.com>
Fri, 13 Jan 2017 07:12:51 +0000 (16:12 +0900)
committerYunjin Lee <yunjin-.lee@samsung.com>
Fri, 13 Jan 2017 07:12:51 +0000 (16:12 +0900)
- 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 <yunjin-.lee@samsung.com>
capi/src/privilege_db_manager.c
capi/src/privilege_manager.c

index 434c3ac..5dc8f6c 100755 (executable)
@@ -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) {
index a3ef4f2..fc7ce6b 100755 (executable)
@@ -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");