Fix ambiguous expression of testing 'get_backend() != RPC_PORT_ERROR_NONE'

The statement below is evaluated as intended.
 • if (ret = hal_device_battery_ipc_get_backend() != RPC_PORT_ERROR_NONE)

Technically, however, to get the evaluation process, it is essential to
know the operator precedence and associativity. To clearly express the
same meaning without knowing such things, fixed it like below.
 • if (hal_device_battery_ipc_get_backend() != RPC_PORT_ERROR_NONE)

Change-Id: I51157a951ced399c4e3cbeea342d40cf7ed2209e
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>

diff --git a/src/hal-api-device-battery-ipc.c b/src/hal-api-device-battery-ipc.c
index c5064d96de3a009174e02618becb22de986d97d9..db20c66ce9ee732dd6abc7eea6ca22ff9448faa9 100644 (file)
--- a/src/hal-api-device-battery-ipc.c
+++ b/src/hal-api-device-battery-ipc.c
@@ -301,7 +301,7 @@ int hal_device_battery_ipc_register_changed_event(hal_device_battery_updated_cb
                return -EINVAL;
 
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_battery_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_battery_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -342,7 +342,7 @@ int hal_device_battery_ipc_unregister_changed_event(hal_device_battery_updated_c
                return -EINVAL;
 
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_battery_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_battery_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -377,7 +377,7 @@ int hal_device_battery_ipc_get_current_state(hal_device_battery_updated_cb updat
                return -EINVAL;
 
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_battery_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_battery_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }

diff --git a/src/hal-api-device-display-ipc.c b/src/hal-api-device-display-ipc.c
index cab66737cd0a071ddd76bb3d3c24cef00d530f43..00bce2f30f0a8ed5fd7e1bab72ff58727f61c938 100644 (file)
--- a/src/hal-api-device-display-ipc.c
+++ b/src/hal-api-device-display-ipc.c
@@ -120,13 +120,11 @@ int hal_device_display_ipc_put_backend(void)
 
 int hal_device_display_ipc_get_max_brightness(int *brightness)
 {
-       int ret = 0;
-
        if (!brightness)
                return -EINVAL;
 
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -145,7 +143,7 @@ int hal_device_display_ipc_get_brightness(int *brightness)
                return -EINVAL;
 
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -160,10 +158,8 @@ int hal_device_display_ipc_get_brightness(int *brightness)
 
 int hal_device_display_ipc_set_brightness(int brightness)
 {
-       int ret = 0;
-
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -174,10 +170,8 @@ int hal_device_display_ipc_set_brightness(int brightness)
 
 int hal_device_display_ipc_set_multi_brightness(int brightness, int step, int delay)
 {
-       int ret = 0;
-
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -188,13 +182,11 @@ int hal_device_display_ipc_set_multi_brightness(int brightness, int step, int de
 
 int hal_device_display_ipc_get_auto_brightness(float lmax, float lmin, float light, int *brightness)
 {
-       int ret = 0;
-
        if (!brightness)
                return -EINVAL;
 
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -212,7 +204,7 @@ int hal_device_display_ipc_get_state(hal_device_display_state_e *state)
                return -EINVAL;
 
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -225,10 +217,8 @@ int hal_device_display_ipc_get_state(hal_device_display_state_e *state)
 
 int hal_device_display_ipc_set_state(hal_device_display_state_e state)
 {
-       int ret = 0;
-
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -246,7 +236,7 @@ int hal_device_display_ipc_get_image_effect(hal_device_display_image_effect_e *e
                return -EINVAL;
 
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -259,10 +249,8 @@ int hal_device_display_ipc_get_image_effect(hal_device_display_image_effect_e *e
 
 int hal_device_display_ipc_set_image_effect(hal_device_display_image_effect_e effect)
 {
-       int ret = 0;
-
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -280,7 +268,7 @@ int hal_device_display_ipc_get_panel_mode(hal_device_display_panel_mode_e *mode)
                return -EINVAL;
 
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -293,10 +281,8 @@ int hal_device_display_ipc_get_panel_mode(hal_device_display_panel_mode_e *mode)
 
 int hal_device_display_ipc_set_panel_mode(hal_device_display_panel_mode_e mode)
 {
-       int ret = 0;
-
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -314,7 +300,7 @@ int hal_device_display_ipc_get_aod_mode(hal_device_display_aod_mode_e *mode)
                return -EINVAL;
 
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -327,13 +313,11 @@ int hal_device_display_ipc_get_aod_mode(hal_device_display_aod_mode_e *mode)
 
 int hal_device_display_ipc_get_aod_brightness(int *max, int *normal, int *min, int *charging)
 {
-       int ret = 0;
-
        if (!max ||!normal ||!min ||!charging)
                return -EINVAL;
 
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -344,13 +328,11 @@ int hal_device_display_ipc_get_aod_brightness(int *max, int *normal, int *min, i
 
 int hal_device_display_ipc_get_max_frame_rate(int *rate)
 {
-       int ret = 0;
-
        if (!rate)
                return -EINVAL;
 
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -361,13 +343,11 @@ int hal_device_display_ipc_get_max_frame_rate(int *rate)
 
 int hal_device_display_ipc_get_min_frame_rate(int *rate)
 {
-       int ret = 0;
-
        if (!rate)
                return -EINVAL;
 
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -378,13 +358,11 @@ int hal_device_display_ipc_get_min_frame_rate(int *rate)
 
 int hal_device_display_ipc_get_frame_rate(int *rate)
 {
-       int ret = 0;
-
        if (!rate)
                return -EINVAL;
 
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -395,10 +373,8 @@ int hal_device_display_ipc_get_frame_rate(int *rate)
 
 int hal_device_display_ipc_set_frame_rate(int rate)
 {
-       int ret = 0;
-
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -409,10 +385,8 @@ int hal_device_display_ipc_set_frame_rate(int rate)
 
 int hal_device_display_ipc_set_white_balance(hal_device_display_white_balance_e white_balance_type, int value)
 {
-       int ret = 0;
-
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -423,13 +397,11 @@ int hal_device_display_ipc_set_white_balance(hal_device_display_white_balance_e
 
 int hal_device_display_ipc_get_white_balance(hal_device_display_white_balance_e white_balance_type, int* value)
 {
-       int ret = 0;
-
        if (!value)
                return -EINVAL;
 
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -447,7 +419,7 @@ int hal_device_display_ipc_get_rotation_angle(int display_index, hal_device_disp
                return -EINVAL;
 
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -462,10 +434,8 @@ int hal_device_display_ipc_set_rotation_angle(int display_index,
                                        hal_device_display_rotation_angle_e angle,
                                        hal_device_display_rotation_direction_e direction)
 {
-       int ret = 0;
-
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_display_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }

diff --git a/src/hal-api-device-led-ipc.c b/src/hal-api-device-led-ipc.c
index 909866066e9c56d41adeaceeb8ccd7f6afb42424..0bd849f82948d2e5e78915614ccea287e3e1c880 100644 (file)
--- a/src/hal-api-device-led-ipc.c
+++ b/src/hal-api-device-led-ipc.c
@@ -124,7 +124,7 @@ int hal_device_led_ipc_set_state(hal_device_led_device_type_e type, hal_device_l
                return -EINVAL;
 
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_led_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_led_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -202,10 +202,8 @@ out:
 
 int hal_device_led_ipc_get_number(void)
 {
-       int ret;
-
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_led_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_led_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -216,10 +214,8 @@ int hal_device_led_ipc_get_number(void)
 
 int hal_device_led_ipc_set_number(int number)
 {
-       int ret;
-
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_led_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_led_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -233,10 +229,8 @@ int hal_device_led_ipc_set_number(int number)
 
 int hal_device_led_ipc_get_max_num(void)
 {
-       int ret;
-
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_led_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_led_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -254,7 +248,7 @@ int hal_device_keyled_ipc_set_state(hal_device_led_keyled_state_s *state)
                return -EINVAL;
 
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_led_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_led_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }
@@ -292,10 +286,8 @@ out:
 
 int hal_device_keyled_ipc_get_state(int *keycode, int *brightness)
 {
-       int ret;
-
        if (!g_hal_backend_service_connected) {
-               if ((ret = hal_device_led_ipc_get_backend() != RPC_PORT_ERROR_NONE)) {
+               if (hal_device_led_ipc_get_backend() != RPC_PORT_ERROR_NONE) {
                        return -ENOTSUP;
                }
        }