DPM: Sync API return value with other bt-service modules.

[platform/core/connectivity/bluetooth-frwk.git] / bt-service / bt-request-handler.c

diff --git a/bt-service/bt-request-handler.c b/bt-service/bt-request-handler.c
index 9f9122f..90d706b 100644 (file)
--- a/bt-service/bt-request-handler.c
+++ b/bt-service/bt-request-handler.c
@@ -1823,16 +1823,14 @@ int __bt_bluez_request(int function_name,
                break;
        }
        case BT_DPM_GET_ALLOW_BT_MODE: {
-               dpm_bt_allow_t value = DPM_BT_ERROR;
+               int value = DPM_BT_ERROR;
 
-               value = _bt_dpm_get_allow_bluetooth_mode();
-               result = DPM_RESULT_SUCCESS;
+               result = _bt_dpm_get_allow_bluetooth_mode(&value);
                g_array_append_vals(*out_param1, &value, sizeof(int));
-
                break;
        }
        case BT_DPM_SET_DEVICE_RESTRITION: {
-               dpm_status_t value = DPM_BT_ERROR;
+               dpm_status_t value = DPM_STATUS_ERROR;
 
                __bt_service_get_parameters(in_param1, &value,
                                sizeof(int));
@@ -1841,16 +1839,14 @@ int __bt_bluez_request(int function_name,
                break;
        }
        case BT_DPM_GET_DEVICE_RESTRITION: {
-               dpm_status_t value = DPM_BT_ERROR;
+               int value = DPM_STATUS_ERROR;
 
-               value = _bt_dpm_is_bluetooth_device_restriction_active();
-               result = DPM_RESULT_SUCCESS;
+               result = _bt_dpm_is_bluetooth_device_restriction_active(&value);
                g_array_append_vals(*out_param1, &value, sizeof(int));
-
                break;
        }
        case BT_DPM_SET_UUID_RESTRITION: {
-               dpm_status_t value = DPM_BT_ERROR;
+               dpm_status_t value = DPM_STATUS_ERROR;
 
                __bt_service_get_parameters(in_param1, &value,
                                sizeof(int));
@@ -1859,12 +1855,10 @@ int __bt_bluez_request(int function_name,
                break;
        }
        case BT_DPM_GET_UUID_RESTRITION: {
-               dpm_status_t value = DPM_BT_ERROR;
+               int value = DPM_STATUS_ERROR;
 
-               value = _bt_dpm_is_bluetooth_uuid_restriction_active();
-               result = DPM_RESULT_SUCCESS;
+               result = _bt_dpm_is_bluetooth_uuid_restriction_active(&value);
                g_array_append_vals(*out_param1, &value, sizeof(int));
-
                break;
        }
        case BT_DPM_ADD_DEVICES_BLACKLIST: {
@@ -1969,7 +1963,7 @@ int __bt_bluez_request(int function_name,
                break;
        }
        case BT_DPM_SET_ALLOW_OUTGOING_CALL: {
-               dpm_status_t value = DPM_BT_ERROR;
+               dpm_status_t value = DPM_STATUS_ERROR;
 
                __bt_service_get_parameters(in_param1, &value,
                                sizeof(int));
@@ -1979,16 +1973,14 @@ int __bt_bluez_request(int function_name,
                break;
        }
        case BT_DPM_GET_ALLOW_OUTGOING_CALL: {
-               dpm_status_t value = DPM_BT_ERROR;
+               int value = DPM_STATUS_ERROR;
 
-               value = _bt_dpm_get_allow_bluetooth_outgoing_call();
-               result = DPM_RESULT_SUCCESS;
+               result = _bt_dpm_get_allow_bluetooth_outgoing_call(&value);
                g_array_append_vals(*out_param1, &value, sizeof(int));
-
                break;
        }
        case BT_DPM_SET_PAIRING_STATE: {
-               dpm_status_t value = DPM_BT_ERROR;
+               dpm_status_t value = DPM_STATUS_ERROR;
 
                __bt_service_get_parameters(in_param1, &value,
                                sizeof(int));
@@ -1998,17 +1990,15 @@ int __bt_bluez_request(int function_name,
                break;
        }
        case BT_DPM_GET_PAIRING_STATE: {
-               dpm_status_t value = DPM_BT_ERROR;
+               int value = DPM_STATUS_ERROR;
 
-               value = _bt_dpm_get_bluetooth_pairing_state();
-               result = DPM_RESULT_SUCCESS;
+               result = _bt_dpm_get_bluetooth_pairing_state(&value);
                g_array_append_vals(*out_param1, &value, sizeof(int));
-
                break;
        }
        case BT_DPM_SET_PROFILE_STATE: {
-               dpm_status_t value = DPM_BT_ERROR;
-               dpm_profile_t profile = DPM_PROFILE_NONE;
+               int value = DPM_STATUS_ERROR;
+               int profile = DPM_PROFILE_NONE;
 
                __bt_service_get_parameters(in_param1, &profile,
                                sizeof(int));
@@ -2020,20 +2010,18 @@ int __bt_bluez_request(int function_name,
                break;
        }
        case BT_DPM_GET_PROFILE_STATE: {
-               dpm_status_t value = DPM_BT_ERROR;
-               dpm_profile_t profile = DPM_PROFILE_NONE;
+               int value = DPM_STATUS_ERROR;
+               int profile = DPM_PROFILE_NONE;
 
-               __bt_service_get_parameters(in_param2, &profile,
+               __bt_service_get_parameters(in_param1, &profile,
                                sizeof(int));
 
-               value = _bt_dpm_get_bluetooth_profile_state(profile);
-               result = DPM_RESULT_SUCCESS;
+               result = _bt_dpm_get_bluetooth_profile_state(profile, &value);
                g_array_append_vals(*out_param1, &value, sizeof(int));
-
                break;
        }
        case BT_DPM_SET_DESKROP_CONNECTIVITY_STATE: {
-               dpm_status_t value = DPM_BT_ERROR;
+               int value = DPM_BT_ERROR;
 
                __bt_service_get_parameters(in_param1, &value,
                                sizeof(int));
@@ -2043,16 +2031,14 @@ int __bt_bluez_request(int function_name,
                break;
        }
        case BT_DPM_GET_DESKROP_CONNECTIVITY_STATE: {
-               dpm_status_t value = DPM_BT_ERROR;
+               int value = DPM_STATUS_ERROR;
 
-               value = _bt_dpm_get_bluetooth_desktop_connectivity_state();
-               result = DPM_RESULT_SUCCESS;
+               result = _bt_dpm_get_bluetooth_desktop_connectivity_state(&value);
                g_array_append_vals(*out_param1, &value, sizeof(int));
-
                break;
        }
        case BT_DPM_SET_DISCOVERABLE_STATE: {
-               dpm_status_t value = DPM_BT_ERROR;
+               int value = DPM_STATUS_ERROR;
 
                __bt_service_get_parameters(in_param1, &value,
                                sizeof(int));
@@ -2062,16 +2048,14 @@ int __bt_bluez_request(int function_name,
                break;
        }
        case BT_DPM_GET_DISCOVERABLE_STATE: {
-               dpm_status_t value = DPM_BT_ERROR;
+               int value = DPM_STATUS_ERROR;
 
-               value = _bt_dpm_get_bluetooth_discoverable_state();
-               result = DPM_RESULT_SUCCESS;
+               result = _bt_dpm_get_bluetooth_discoverable_state(&value);
                g_array_append_vals(*out_param1, &value, sizeof(int));
-
                break;
        }
        case BT_DPM_SET_LIMITED_DISCOVERABLE_STATE: {
-               dpm_status_t value = DPM_BT_ERROR;
+               int value = DPM_STATUS_ERROR;
 
                __bt_service_get_parameters(in_param1, &value,
                                sizeof(int));
@@ -2081,16 +2065,14 @@ int __bt_bluez_request(int function_name,
                break;
        }
        case BT_DPM_GET_LIMITED_DISCOVERABLE_STATE: {
-               dpm_status_t value = DPM_BT_ERROR;
+               int value = DPM_STATUS_ERROR;
 
-               value = _bt_dpm_get_bluetooth_limited_discoverable_state();
-               result = DPM_RESULT_SUCCESS;
+               result = _bt_dpm_get_bluetooth_limited_discoverable_state(&value);
                g_array_append_vals(*out_param1, &value, sizeof(int));
-
                break;
        }
        case BT_DPM_SET_DATA_TRANSFER_STATE: {
-               dpm_status_t value = DPM_BT_ERROR;
+               int value = DPM_STATUS_ERROR;
 
                __bt_service_get_parameters(in_param1, &value,
                                sizeof(int));
@@ -2100,12 +2082,10 @@ int __bt_bluez_request(int function_name,
                break;
        }
        case BT_DPM_GET_DATA_TRANSFER_STATE: {
-               dpm_status_t value = DPM_BT_ERROR;
+               int value = DPM_STATUS_ERROR;
 
-               value = _bt_dpm_get_allow_bluetooth_data_transfer_state();
-               result = DPM_RESULT_SUCCESS;
+               result = _bt_dpm_get_allow_bluetooth_data_transfer_state(&value);
                g_array_append_vals(*out_param1, &value, sizeof(int));
-
                break;
        }
        case BT_PXP_MONITOR_SET_PROPERTY: {