From 0e05737b020b0ef56cab2f2954f045a48f84e88f Mon Sep 17 00:00:00 2001 From: Yunmi Ha Date: Tue, 17 Nov 2020 16:12:57 +0900 Subject: [PATCH] Change system error to device error code Change-Id: I4a33afe41699a1aeb76821bcf234ab2e56f8676d Signed-off-by: Yunmi Ha Signed-off-by: lokilee73 --- src/display.c | 9 +++++++-- src/led.c | 6 +++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/display.c b/src/display.c index 315cb0e..7aa5d67 100644 --- a/src/display.c +++ b/src/display.c @@ -270,7 +270,7 @@ int device_display_change_state(display_state_e state) METHOD_CHANGE_STATE, g_variant_new("(s)", "privilege check")); //LCOV_EXCL_START System Error if (ret < 0) - return ret; + return errno_to_device_error(ret); //LCOV_EXCL_LINE System Error //LCOV_EXCL_STOP else privilege = 1; @@ -280,9 +280,14 @@ int device_display_change_state(display_state_e state) if (!str) return DEVICE_ERROR_INVALID_PARAMETER; - return dbus_handle_method_async_with_reply_var(DEVICED_BUS_NAME, + ret = dbus_handle_method_async_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, METHOD_CHANGE_STATE, g_variant_new("(s)", str), change_cb, -1, NULL); + + if (ret < 0) + ret = errno_to_device_error(ret); //LCOV_EXCL_LINE System Error + + return ret; } int device_display_get_max_brightness_state(int display_index, display_state_e state, int *brightness) diff --git a/src/led.c b/src/led.c index bbb00a9..e31d302 100644 --- a/src/led.c +++ b/src/led.c @@ -206,6 +206,10 @@ int device_multi_led_control(unsigned int color[]) var = g_variant_new("(au)", builder); g_variant_builder_unref(builder); - return dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_LED, + ret = dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_LED, DEVICED_INTERFACE_LED, METHOD_MULTI_LED_CONTROL, var); + if (ret < 0) + return errno_to_device_error(ret); //LCOV_EXCL_LINE System Error + + return DEVICE_ERROR_NONE; } -- 2.7.4