remove transmitted data unneccessarily.

Change-Id: I2af66029a4a6fc354c767639054f0feead3ecc06
Signed-off-by: jiseob.jang <jiseob.jang@samsung.com>

diff --git a/src/account.c b/src/account.c
index e638294..c95723f 100644 (file)
--- a/src/account.c
+++ b/src/account.c
@@ -319,7 +319,6 @@ ACCOUNT_API int account_disconnect(void)
 ACCOUNT_API int account_insert_to_db(account_h account, int *account_db_id)
 {
        _INFO("1. account_insert_to_db start");
-       char* account_db_path = ACCOUNT_DB_PATH;
 
        ACCOUNT_RETURN_VAL((account != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("ACCOUNT HANDLE IS NULL"));
        ACCOUNT_RETURN_VAL((account_db_id != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("ACCOUNT ID POINTER IS NULL"));
@@ -336,7 +335,7 @@ ACCOUNT_API int account_insert_to_db(account_h account, int *account_db_id)
        GVariant* account_serialized = marshal_account(account_data);
 
        _INFO("3. Before account_manager_call_account_add_sync");
-       bool is_success = account_manager_call_account_add_sync(acc_mgr, account_db_path, account_serialized, &db_id, NULL, &error);
+       bool is_success = account_manager_call_account_add_sync(acc_mgr, account_serialized, &db_id, NULL, &error);
        ACCOUNT_CATCH_ERROR((is_success != false), {}, _account_get_error_code(is_success, error), "Failed to get dbus.");
 
        *account_db_id = db_id;
@@ -356,7 +355,6 @@ CATCH:
 ACCOUNT_API int account_delete_from_db_by_id(int account_db_id)
 {
        _INFO("1. account_delete_from_db_by_id starting [%d]", account_db_id);
-       char* account_db_path = ACCOUNT_DB_PATH;
        int error_code = ACCOUNT_ERROR_NONE;
 
        ACCOUNT_RETURN_VAL((account_db_id > 0), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("ACCOUNT ID IS LESS THAN ZERO."));
@@ -372,7 +370,7 @@ ACCOUNT_API int account_delete_from_db_by_id(int account_db_id)
 
        _INFO("2. Before account_manager_call_account_query_account_by_account_id_sync");
        GVariant *account_serialized_old = NULL;
-       bool is_success = account_manager_call_account_query_account_by_account_id_sync(acc_mgr, account_db_path, account_db_id, &account_serialized_old, NULL, &error);
+       bool is_success = account_manager_call_account_query_account_by_account_id_sync(acc_mgr, account_db_id, &account_serialized_old, NULL, &error);
 
        if (!is_success)
        {
@@ -382,7 +380,7 @@ ACCOUNT_API int account_delete_from_db_by_id(int account_db_id)
        }
 
        _INFO("3. Before account_manager_call_account_delete_from_db_by_id_sync");
-       is_success = account_manager_call_account_delete_from_db_by_id_sync(acc_mgr, account_db_path, account_db_id, NULL, &error);
+       is_success = account_manager_call_account_delete_from_db_by_id_sync(acc_mgr, account_db_id, NULL, &error);
 
        if (!is_success)
        {
@@ -398,7 +396,6 @@ ACCOUNT_API int account_delete_from_db_by_id(int account_db_id)
 ACCOUNT_API int account_delete_from_db_by_user_name(char *user_name, char *package_name)
 {
        int error_code = ACCOUNT_ERROR_NONE;
-       char* account_db_path = ACCOUNT_DB_PATH;
        _INFO("account_delete_from_db_by_user_name start");
 
        ACCOUNT_RETURN_VAL((user_name != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("user_name is null!"));
@@ -415,7 +412,7 @@ ACCOUNT_API int account_delete_from_db_by_user_name(char *user_name, char *packa
        }
 
        GVariant* account_list_variant = NULL;
-       bool is_success = account_manager_call_account_query_account_by_user_name_sync(acc_mgr, account_db_path, user_name, &account_list_variant, NULL, &error);
+       bool is_success = account_manager_call_account_query_account_by_user_name_sync(acc_mgr, user_name, &account_list_variant, NULL, &error);
 
        error_code = _account_get_error_code(is_success, error);
        if (error_code != ACCOUNT_ERROR_NONE)
@@ -434,7 +431,7 @@ ACCOUNT_API int account_delete_from_db_by_user_name(char *user_name, char *packa
 
        //TODO free account_list, account_list_variant
 
-       is_success = account_manager_call_account_delete_from_db_by_user_name_sync(acc_mgr, account_db_path, user_name, package_name, NULL, &error);
+       is_success = account_manager_call_account_delete_from_db_by_user_name_sync(acc_mgr, user_name, package_name, NULL, &error);
 
        if (!is_success)
        {
@@ -451,7 +448,6 @@ ACCOUNT_API int account_delete_from_db_by_user_name(char *user_name, char *packa
 int _account_delete_from_db_by_package_name(const char *package_name, bool permission)
 {
        _INFO("_account_delete_from_db_by_package_name starting permission opions = %d", permission);
-       char* account_db_path = ACCOUNT_DB_PATH;
        int error_code = ACCOUNT_ERROR_NONE;
 
        ACCOUNT_RETURN_VAL((package_name != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("package_name is null!"));
@@ -483,7 +479,7 @@ int _account_delete_from_db_by_package_name(const char *package_name, bool permi
                return ACCOUNT_ERROR_NO_DATA;
        }
 */
-       bool is_success = account_manager_call_account_delete_from_db_by_package_name_sync(acc_mgr, account_db_path, package_name, permission, NULL, &error);
+       bool is_success = account_manager_call_account_delete_from_db_by_package_name_sync(acc_mgr, package_name, permission, NULL, &error);
 
        if (!is_success)
        {
@@ -511,7 +507,6 @@ ACCOUNT_API int account_update_to_db_by_id(account_h account, int account_id)
 {
        //First we will update account db
        _INFO("1. account_update_to_db_by_id start");
-       char* account_db_path = ACCOUNT_DB_PATH;
        int error_code = ACCOUNT_ERROR_NONE;
 
        ACCOUNT_RETURN_VAL((account != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("DATA IS NULL"));
@@ -528,7 +523,7 @@ ACCOUNT_API int account_update_to_db_by_id(account_h account, int account_id)
 
        _INFO("2. Before account_manager_call_account_query_account_by_account_id_sync");
        GVariant *account_serialized_old = NULL;
-       bool is_success = account_manager_call_account_query_account_by_account_id_sync(acc_mgr, account_db_path, account_id, &account_serialized_old, NULL, &error);
+       bool is_success = account_manager_call_account_query_account_by_account_id_sync(acc_mgr, account_id, &account_serialized_old, NULL, &error);
 
        if (!is_success)
        {
@@ -539,7 +534,7 @@ ACCOUNT_API int account_update_to_db_by_id(account_h account, int account_id)
 
        _INFO("3. Before account_manager_call_account_update_to_db_by_id_sync");
        GVariant* account_serialized = marshal_account((account_s*) account);
-       is_success = account_manager_call_account_update_to_db_by_id_sync(acc_mgr, account_db_path, account_serialized, account_id, NULL, &error);
+       is_success = account_manager_call_account_update_to_db_by_id_sync(acc_mgr, account_serialized, account_id, NULL, &error);
 
        if (!is_success)
        {
@@ -566,7 +561,6 @@ ACCOUNT_INTERNAL_API int account_update_to_db_by_id_without_permission(account_h
        //Then we will update gSSO DB, if it fails then we will rollback account db updates
 
        _INFO("account_update_to_db_by_id_without_permission start");
-       char* account_db_path = ACCOUNT_DB_PATH;
        int error_code = ACCOUNT_ERROR_NONE;
 
        ACCOUNT_RETURN_VAL((account != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("DATA IS NULL"));
@@ -583,7 +577,7 @@ ACCOUNT_INTERNAL_API int account_update_to_db_by_id_without_permission(account_h
 
        GVariant *account_serialized_old = NULL;
        _INFO("before query() account_id[%d]", account_id);
-       bool is_success = account_manager_call_account_query_account_by_account_id_sync(acc_mgr, account_db_path, account_id, &account_serialized_old, NULL, &error);
+       bool is_success = account_manager_call_account_query_account_by_account_id_sync(acc_mgr, account_id, &account_serialized_old, NULL, &error);
 
        if (!is_success)
        {
@@ -602,7 +596,7 @@ ACCOUNT_INTERNAL_API int account_update_to_db_by_id_without_permission(account_h
        }
 
        _INFO("before call update() : account_id[%d]", account_id);
-       is_success = account_manager_call_account_update_to_db_by_id_ex_sync(acc_mgr, account_db_path, account_serialized, account_id, NULL, &error);
+       is_success = account_manager_call_account_update_to_db_by_id_ex_sync(acc_mgr, account_serialized, account_id, NULL, &error);
 
        _INFO("after call update() : is_success=%d", is_success);
        if (!is_success)
@@ -619,7 +613,6 @@ ACCOUNT_API int account_update_to_db_by_user_name(account_h account, const char
 {
        //First we will update account db
        _INFO("account_update_to_db_by_user_name starting");
-       char* account_db_path = ACCOUNT_DB_PATH;
        int error_code = ACCOUNT_ERROR_NONE;
 
        ACCOUNT_RETURN_VAL((account != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("DATA IS NULL"));
@@ -637,7 +630,7 @@ ACCOUNT_API int account_update_to_db_by_user_name(account_h account, const char
 
        GVariant *account_serialized_old = NULL;
        account_s *account_data = (account_s*) account;
-       bool is_success = account_manager_call_account_query_account_by_account_id_sync(acc_mgr, account_db_path, account_data->id, &account_serialized_old, NULL, &error);
+       bool is_success = account_manager_call_account_query_account_by_account_id_sync(acc_mgr, account_data->id, &account_serialized_old, NULL, &error);
 
        if (!is_success)
        {
@@ -647,7 +640,7 @@ ACCOUNT_API int account_update_to_db_by_user_name(account_h account, const char
        }
 
        GVariant* account_serialized = marshal_account(account_data);
-       is_success = account_manager_call_account_update_to_db_by_user_name_sync(acc_mgr, account_db_path, account_serialized, user_name, package_name, NULL, &error);
+       is_success = account_manager_call_account_update_to_db_by_user_name_sync(acc_mgr, account_serialized, user_name, package_name, NULL, &error);
 
        if (!is_success)
        {
@@ -1393,7 +1386,6 @@ ACCOUNT_API int account_get_custom_all(account_h account, account_custom_cb call
 ACCOUNT_API int account_foreach_account_from_db(account_cb callback, void *user_data)
 {
        _INFO("account_foreach_account_from_db start");
-       char* account_db_path = ACCOUNT_DB_PATH;
 
        ACCOUNT_RETURN_VAL((callback != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("ACCOUNT Callback IS NULL"));
 
@@ -1407,7 +1399,7 @@ ACCOUNT_API int account_foreach_account_from_db(account_cb callback, void *user_
        }
 
        GVariant* account_list_variant = NULL;
-       bool is_success = account_manager_call_account_query_all_sync(acc_mgr, account_db_path, &account_list_variant, NULL, &error);
+       bool is_success = account_manager_call_account_query_all_sync(acc_mgr, &account_list_variant, NULL, &error);
 
        int error_code = _account_get_error_code(is_success, error);
        if (error_code != ACCOUNT_ERROR_NONE)
@@ -1444,7 +1436,6 @@ ACCOUNT_API int account_foreach_account_from_db(account_cb callback, void *user_
 ACCOUNT_API int account_query_account_by_account_id(int account_db_id, account_h *account)
 {
        _INFO("account_query_account_by_account_id start [%d]", account_db_id);
-       char* account_db_path = ACCOUNT_DB_PATH;
 
        ACCOUNT_RETURN_VAL((account_db_id > 0), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("ACCOUNT INDEX IS LESS THAN 0"));
        ACCOUNT_RETURN_VAL((account != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("ACCOUNT POINTER IS NULL"));
@@ -1460,7 +1451,7 @@ ACCOUNT_API int account_query_account_by_account_id(int account_db_id, account_h
        }
 
        GVariant* account_variant = NULL;
-       bool is_success = account_manager_call_account_query_account_by_account_id_sync(acc_mgr, account_db_path, account_db_id, &account_variant, NULL, &error);
+       bool is_success = account_manager_call_account_query_account_by_account_id_sync(acc_mgr, account_db_id, &account_variant, NULL, &error);
 
        int error_code = _account_get_error_code(is_success, error);
        if (error_code != ACCOUNT_ERROR_NONE)
@@ -1493,7 +1484,6 @@ ACCOUNT_API int account_query_account_by_account_id(int account_db_id, account_h
 ACCOUNT_API int account_query_account_by_user_name(account_cb callback, const char* user_name, void* user_data)
 {
        _INFO("account_query_account_by_user_name starting");
-       char* account_db_path = ACCOUNT_DB_PATH;
 
        ACCOUNT_RETURN_VAL((user_name != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("USER NAME IS NULL"));
        ACCOUNT_RETURN_VAL((callback != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("CALL BACK IS NULL"));
@@ -1508,7 +1498,7 @@ ACCOUNT_API int account_query_account_by_user_name(account_cb callback, const ch
        }
 
        GVariant* account_list_variant = NULL;
-       bool is_success = account_manager_call_account_query_account_by_user_name_sync(acc_mgr, account_db_path, user_name, &account_list_variant, NULL, &error);
+       bool is_success = account_manager_call_account_query_account_by_user_name_sync(acc_mgr, user_name, &account_list_variant, NULL, &error);
 
        int error_code = _account_get_error_code(is_success, error);
        if (error_code != ACCOUNT_ERROR_NONE)
@@ -1546,7 +1536,6 @@ ACCOUNT_API int account_query_account_by_user_name(account_cb callback, const ch
 ACCOUNT_API int account_query_account_by_package_name(account_cb callback, const char *package_name, void *user_data)
 {
        _INFO("account_query_account_by_package_name starting");
-       char* account_db_path = ACCOUNT_DB_PATH;
 
        ACCOUNT_RETURN_VAL((package_name != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("PACKAGE NAME IS NULL"));
        ACCOUNT_RETURN_VAL((callback != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("CALL BACK IS NULL"));
@@ -1561,7 +1550,7 @@ ACCOUNT_API int account_query_account_by_package_name(account_cb callback, const
        }
 
        GVariant* account_list_variant = NULL;
-       bool is_success = account_manager_call_account_query_account_by_package_name_sync(acc_mgr, account_db_path, package_name, &account_list_variant, NULL, &error);
+       bool is_success = account_manager_call_account_query_account_by_package_name_sync(acc_mgr, package_name, &account_list_variant, NULL, &error);
 
        int error_code = _account_get_error_code(is_success, error);
        if (error_code != ACCOUNT_ERROR_NONE)
@@ -1599,7 +1588,6 @@ ACCOUNT_API int account_query_account_by_package_name(account_cb callback, const
 ACCOUNT_API int account_query_account_by_capability(account_cb callback, const char* capability_type, account_capability_state_e capability_value, void *user_data)
 {
        _INFO("account_query_account_by_capability starting");
-       char* account_db_path = ACCOUNT_DB_PATH;
 
        ACCOUNT_RETURN_VAL((capability_type != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("capability_type IS NULL"));
 
@@ -1620,7 +1608,7 @@ ACCOUNT_API int account_query_account_by_capability(account_cb callback, const c
        }
 
        GVariant* account_list_variant = NULL;
-       bool is_success = account_manager_call_account_query_account_by_capability_sync(acc_mgr, account_db_path, capability_type, capability_value, &account_list_variant, NULL, &error);
+       bool is_success = account_manager_call_account_query_account_by_capability_sync(acc_mgr, capability_type, capability_value, &account_list_variant, NULL, &error);
 
        int error_code = _account_get_error_code(is_success, error);
        if (error_code != ACCOUNT_ERROR_NONE)
@@ -1658,7 +1646,6 @@ ACCOUNT_API int account_query_account_by_capability(account_cb callback, const c
 ACCOUNT_API int account_query_account_by_capability_type(account_cb callback, const char* capability_type, void* user_data)
 {
        _INFO("account_query_account_by_capability_type starting");
-       char* account_db_path = ACCOUNT_DB_PATH;
 
        ACCOUNT_RETURN_VAL((capability_type != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("capability_type IS NULL"));
        ACCOUNT_RETURN_VAL((callback != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("CALL BACK IS NULL"));
@@ -1673,7 +1660,7 @@ ACCOUNT_API int account_query_account_by_capability_type(account_cb callback, co
        }
 
        GVariant* account_list_variant = NULL;
-       bool is_success = account_manager_call_account_query_account_by_capability_type_sync(acc_mgr, account_db_path, capability_type, &account_list_variant, NULL, &error);
+       bool is_success = account_manager_call_account_query_account_by_capability_type_sync(acc_mgr, capability_type, &account_list_variant, NULL, &error);
 
        int error_code = _account_get_error_code(is_success, error);
        if (error_code != ACCOUNT_ERROR_NONE)
@@ -1711,7 +1698,6 @@ ACCOUNT_API int account_query_account_by_capability_type(account_cb callback, co
 ACCOUNT_API int account_query_capability_by_account_id(capability_cb callback, int account_id, void *user_data)
 {
        _INFO("account_query_capability_by_account_id starting");
-       char* account_db_path = ACCOUNT_DB_PATH;
 
        ACCOUNT_RETURN_VAL((account_id > 0), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("ACCOUNT INDEX IS LESS THAN 0"));
        ACCOUNT_RETURN_VAL((callback != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("NO CALLBACK FUNCTION"));
@@ -1725,7 +1711,7 @@ ACCOUNT_API int account_query_capability_by_account_id(capability_cb callback, i
        }
 
        GVariant* capability_list_variant = NULL;
-       bool is_success = account_manager_call_account_query_capability_by_account_id_sync(acc_mgr, account_db_path, account_id, &capability_list_variant, NULL, &error);
+       bool is_success = account_manager_call_account_query_capability_by_account_id_sync(acc_mgr, account_id, &capability_list_variant, NULL, &error);
 
        int error_code = _account_get_error_code(is_success, error);
        if (error_code != ACCOUNT_ERROR_NONE)
@@ -1765,7 +1751,6 @@ ACCOUNT_API int account_query_capability_by_account_id(capability_cb callback, i
 static int _account_get_total_count(int *count, bool include_hidden)
 {
        _INFO("account_get_total_count_from_db starting");
-       char* account_db_path = ACCOUNT_DB_PATH;
 
        if (!count)
        {
@@ -1789,7 +1774,7 @@ static int _account_get_total_count(int *count, bool include_hidden)
        }
 
        int temp_count = -1;
-       bool is_success = account_manager_call_account_get_total_count_from_db_sync(acc_mgr, account_db_path, include_hidden, &temp_count, NULL, &error);
+       bool is_success = account_manager_call_account_get_total_count_from_db_sync(acc_mgr, include_hidden, &temp_count, NULL, &error);
        int error_code = _account_get_error_code(is_success, error);
        if (error_code != ACCOUNT_ERROR_NONE)
        {
@@ -1818,7 +1803,6 @@ ACCOUNT_INTERNAL_API int account_get_total_count_from_db_ex(int *count)
 ACCOUNT_API int account_update_sync_status_by_id(int account_db_id, const account_sync_state_e sync_status)
 {
        _INFO("account_update_sync_status_by_id starting");
-       char* account_db_path = ACCOUNT_DB_PATH;
 
        ACCOUNT_RETURN_VAL((account_db_id > 0), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("ACCOUNT INDEX IS LESS THAN 0"));
        if ( ((int)sync_status < 0) || (sync_status > ACCOUNT_SYNC_STATUS_RUNNING)) {
@@ -1835,7 +1819,7 @@ ACCOUNT_API int account_update_sync_status_by_id(int account_db_id, const accoun
                return ACCOUNT_ERROR_PERMISSION_DENIED;
        }
 
-       bool is_success = account_manager_call_account_update_sync_status_by_id_sync(acc_mgr, account_db_path, account_db_id, sync_status, NULL, &error);
+       bool is_success = account_manager_call_account_update_sync_status_by_id_sync(acc_mgr, account_db_id, sync_status, NULL, &error);
 
        return _account_get_error_code(is_success, error);
 }
@@ -2156,7 +2140,6 @@ ACCOUNT_INTERNAL_API int account_type_set_provider_feature(account_type_h accoun
 ACCOUNT_API int account_type_query_provider_feature_by_app_id(provider_feature_cb callback, const char* app_id, void *user_data )
 {
        _INFO("account_type_query_provider_feature_by_app_id start");
-       char* account_db_path = ACCOUNT_DB_PATH;
 
        ACCOUNT_RETURN_VAL((app_id != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("APP ID IS NULL"));
        ACCOUNT_RETURN_VAL((callback != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("NO CALLBACK FUNCTION"));
@@ -2172,7 +2155,7 @@ ACCOUNT_API int account_type_query_provider_feature_by_app_id(provider_feature_c
        }
 
        GVariant* feature_list_variant = NULL;
-       bool is_success = account_manager_call_account_type_query_provider_feature_by_app_id_sync(acc_mgr, account_db_path, app_id, &feature_list_variant, NULL, &error);
+       bool is_success = account_manager_call_account_type_query_provider_feature_by_app_id_sync(acc_mgr, app_id, &feature_list_variant, NULL, &error);
 
        _INFO("account_manager_call_account_type_query_provider_feature_by_app_id_sync end=[%d]", is_success);
 
@@ -2212,7 +2195,6 @@ ACCOUNT_API int account_type_query_provider_feature_by_app_id(provider_feature_c
 ACCOUNT_API bool account_type_query_supported_feature(const char* app_id, const char* capability)
 {
        _INFO("account_type_query_supported_feature start");
-       char* account_db_path = ACCOUNT_DB_PATH;
 
        if (app_id == NULL || capability == NULL)
        {
@@ -2232,7 +2214,7 @@ ACCOUNT_API bool account_type_query_supported_feature(const char* app_id, const
                return false;
        }
 
-       bool is_success = account_manager_call_account_type_query_supported_feature_sync(acc_mgr, account_db_path, app_id, capability, &is_supported, NULL, &error);
+       bool is_success = account_manager_call_account_type_query_supported_feature_sync(acc_mgr, app_id, capability, &is_supported, NULL, &error);
 
        _INFO("account_manager_call_account_type_query_supported_feature_sync end=[%d]", is_success);
 
@@ -2428,7 +2410,6 @@ ACCOUNT_API int account_type_get_label(account_type_h account_type, account_labe
 ACCOUNT_INTERNAL_API int account_type_insert_to_db(account_type_h account_type, int* account_type_id)
 {
        _INFO("account_type_insert_to_db starting");
-       char* account_db_path = ACCOUNT_DB_PATH;
 
        ACCOUNT_RETURN_VAL((account_type != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("ACCOUNT TYPE HANDLE IS NULL"));
        ACCOUNT_RETURN_VAL((account_type_id != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("ACCOUNT TYPE ID POINTER IS NULL"));
@@ -2444,7 +2425,7 @@ ACCOUNT_INTERNAL_API int account_type_insert_to_db(account_type_h account_type,
 
        int db_id = -1;
        GVariant* account_type_serialized = marshal_account_type((account_type_s*) account_type);
-       bool is_success = account_manager_call_account_type_add_sync(acc_mgr, account_db_path, account_type_serialized, &db_id, NULL, &error);
+       bool is_success = account_manager_call_account_type_add_sync(acc_mgr, account_type_serialized, &db_id, NULL, &error);
 
        int ret = _account_get_error_code(is_success, error);
        if (ret != ACCOUNT_ERROR_NONE)
@@ -2465,7 +2446,6 @@ ACCOUNT_INTERNAL_API int account_type_insert_to_db(account_type_h account_type,
 ACCOUNT_INTERNAL_API int account_type_update_to_db_by_app_id(const account_type_h account_type, const char* app_id)
 {
        _INFO("account_type_update_to_db_by_app_id starting");
-       char* account_db_path = ACCOUNT_DB_PATH;
 
        ACCOUNT_RETURN_VAL((account_type != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("DATA IS NULL"));
        ACCOUNT_RETURN_VAL((app_id != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("APP ID IS NULL"));
@@ -2486,7 +2466,7 @@ ACCOUNT_INTERNAL_API int account_type_update_to_db_by_app_id(const account_type_
                return ACCOUNT_ERROR_INVALID_PARAMETER;
        }
 
-       bool is_success = account_manager_call_account_type_update_to_db_by_app_id_sync(acc_mgr, account_db_path, account_type_variant, app_id, NULL, &error);
+       bool is_success = account_manager_call_account_type_update_to_db_by_app_id_sync(acc_mgr, account_type_variant, app_id, NULL, &error);
 
        return _account_get_error_code(is_success, error);
 }
@@ -2494,7 +2474,6 @@ ACCOUNT_INTERNAL_API int account_type_update_to_db_by_app_id(const account_type_
 ACCOUNT_INTERNAL_API int account_type_delete_by_app_id(const char* app_id)
 {
        _INFO("account_type_delete_by_app_id starting");
-       char* account_db_path = ACCOUNT_DB_PATH;
 
        ACCOUNT_RETURN_VAL((app_id != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("APP ID IS NULL"));
 
@@ -2507,7 +2486,7 @@ ACCOUNT_INTERNAL_API int account_type_delete_by_app_id(const char* app_id)
                return ACCOUNT_ERROR_PERMISSION_DENIED;
        }
 
-       bool is_success = account_manager_call_account_type_delete_by_app_id_sync(acc_mgr, account_db_path, app_id, NULL, &error);
+       bool is_success = account_manager_call_account_type_delete_by_app_id_sync(acc_mgr, app_id, NULL, &error);
 
        return _account_get_error_code(is_success, error);
 }
@@ -2515,7 +2494,6 @@ ACCOUNT_INTERNAL_API int account_type_delete_by_app_id(const char* app_id)
 ACCOUNT_API int account_type_query_label_by_app_id(account_label_cb callback, const char* app_id, void *user_data )
 {
        _INFO("account_type_query_label_by_app_id starting");
-       char* account_db_path = ACCOUNT_DB_PATH;
 
        ACCOUNT_RETURN_VAL((callback != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("ACCOUNT Callback IS NULL"));
        ACCOUNT_RETURN_VAL((app_id != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("APP ID IS NULL"));
@@ -2530,7 +2508,7 @@ ACCOUNT_API int account_type_query_label_by_app_id(account_label_cb callback, co
        }
 
        GVariant* label_list_variant = NULL;
-       bool is_success = account_manager_call_account_type_query_label_by_app_id_sync(acc_mgr, account_db_path, app_id, &label_list_variant, NULL, &error);
+       bool is_success = account_manager_call_account_type_query_label_by_app_id_sync(acc_mgr, app_id, &label_list_variant, NULL, &error);
 
        int ret = _account_get_error_code(is_success, error);
        if (ret != ACCOUNT_ERROR_NONE)
@@ -2570,7 +2548,6 @@ ACCOUNT_API int account_type_query_label_by_app_id(account_label_cb callback, co
 ACCOUNT_API int account_type_query_by_app_id(const char* app_id, account_type_h *account_type)
 {
        _INFO("account_type_query_by_app_id starting");
-       char* account_db_path = ACCOUNT_DB_PATH;
 
        ACCOUNT_RETURN_VAL((app_id != 0), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("APP ID IS NULL"));
        ACCOUNT_RETURN_VAL((account_type != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("ACCOUNT TYPE'S POINTER IS NULL"));
@@ -2588,7 +2565,7 @@ ACCOUNT_API int account_type_query_by_app_id(const char* app_id, account_type_h
        GVariant* account_type_variant = NULL;
        account_type_s *in_data = (account_type_s*) (*account_type);
 
-       bool is_success = account_manager_call_account_type_query_by_app_id_sync(acc_mgr, account_db_path, app_id, &account_type_variant, NULL, &error);
+       bool is_success = account_manager_call_account_type_query_by_app_id_sync(acc_mgr, app_id, &account_type_variant, NULL, &error);
 
        int ret = _account_get_error_code(is_success, error);
        if (ret != ACCOUNT_ERROR_NONE)
@@ -2616,7 +2593,6 @@ ACCOUNT_API int account_type_query_by_app_id(const char* app_id, account_type_h
 ACCOUNT_API int account_type_foreach_account_type_from_db(account_type_cb callback, void *user_data)
 {
        _INFO("account_type_foreach_account_type_from_db starting");
-       char* account_db_path = ACCOUNT_DB_PATH;
 
        ACCOUNT_RETURN_VAL((callback != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("ACCOUNT Callback IS NULL"));
 
@@ -2631,7 +2607,7 @@ ACCOUNT_API int account_type_foreach_account_type_from_db(account_type_cb callba
 
        GVariant* account_type_list_variant = NULL;
        _INFO("before account_type_query_all_sync()");
-       bool is_success = account_manager_call_account_type_query_all_sync(acc_mgr, account_db_path, &account_type_list_variant, NULL, &error);
+       bool is_success = account_manager_call_account_type_query_all_sync(acc_mgr, &account_type_list_variant, NULL, &error);
 
        _INFO("after account_type_query_all_sync()");
        int ret = _account_get_error_code(is_success, error);
@@ -2671,7 +2647,6 @@ ACCOUNT_API int account_type_foreach_account_type_from_db(account_type_cb callba
 ACCOUNT_API int account_type_query_label_by_locale(const char* app_id, const char* locale, char** label)
 {
        _INFO("account_type_query_label_by_locale starting");
-       char* account_db_path = ACCOUNT_DB_PATH;
 
        ACCOUNT_RETURN_VAL((app_id != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("NO APP ID"));
        ACCOUNT_RETURN_VAL((locale != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("NO LOCALE"));
@@ -2688,7 +2663,7 @@ ACCOUNT_API int account_type_query_label_by_locale(const char* app_id, const cha
 
        char* label_temp = NULL;
        _INFO("before account_type_query_label_by_locale_sync()");
-       bool is_success = account_manager_call_account_type_query_label_by_locale_sync(acc_mgr, account_db_path, app_id, locale, &label_temp, NULL, &error);
+       bool is_success = account_manager_call_account_type_query_label_by_locale_sync(acc_mgr, app_id, locale, &label_temp, NULL, &error);
 
        _INFO("after account_type_query_label_by_locale_sync() : is_success=%d", is_success);
        int ret = _account_get_error_code(is_success, error);
@@ -2711,7 +2686,6 @@ ACCOUNT_API int account_type_query_label_by_locale(const char* app_id, const cha
 ACCOUNT_API int account_type_query_by_provider_feature(account_type_cb callback, const char* key, void* user_data)
 {
        _INFO("account_type_query_by_provider_feature starting");
-       char* account_db_path = ACCOUNT_DB_PATH;
 
        ACCOUNT_RETURN_VAL((key != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("capability_type IS NULL"));
        ACCOUNT_RETURN_VAL((callback != NULL), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("CALL BACK IS NULL"));
@@ -2726,7 +2700,7 @@ ACCOUNT_API int account_type_query_by_provider_feature(account_type_cb callback,
        }
 
        GVariant* account_type_list_variant = NULL;
-       bool is_success = account_manager_call_account_type_query_by_provider_feature_sync(acc_mgr, account_db_path, key, &account_type_list_variant, NULL, &error);
+       bool is_success = account_manager_call_account_type_query_by_provider_feature_sync(acc_mgr, key, &account_type_list_variant, NULL, &error);
 
        int ret = _account_get_error_code(is_success, error);
        if (ret != ACCOUNT_ERROR_NONE)
@@ -2766,7 +2740,6 @@ ACCOUNT_API int account_type_query_by_provider_feature(account_type_cb callback,
 ACCOUNT_API int account_type_query_app_id_exist(const char* app_id)
 {
        _INFO("account_type_query_app_id_exist starting");
-       char* account_db_path = ACCOUNT_DB_PATH;
 
        ACCOUNT_RETURN_VAL((app_id != 0), {}, ACCOUNT_ERROR_INVALID_PARAMETER, ("APP ID IS NULL"));
 
@@ -2779,7 +2752,7 @@ ACCOUNT_API int account_type_query_app_id_exist(const char* app_id)
                return ACCOUNT_ERROR_PERMISSION_DENIED;
        }
 
-       bool is_success = account_manager_call_account_type_query_app_id_exist_sync(acc_mgr, account_db_path, app_id, NULL, &error);
+       bool is_success = account_manager_call_account_type_query_app_id_exist_sync(acc_mgr, app_id, NULL, &error);
 
        return _account_get_error_code(is_success, error);
 }