From: Youngjae Cho Date: Wed, 19 Aug 2020 06:52:55 +0000 (+0900) Subject: Typedef change: dbus_pending_cb -> device_dbus_pending_cb X-Git-Tag: submit/tizen/20200824.103034~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=98d5db0d828e1aea0ce943ba01f1b4ad2f62758c;p=platform%2Fcore%2Fapi%2Fdevice.git Typedef change: dbus_pending_cb -> device_dbus_pending_cb Change-Id: I1308144009a355d9c4580391ed6c1ac126255bce Signed-off-by: Youngjae Cho --- diff --git a/include/display-internal.h b/include/display-internal.h index fb1920b..a50b87b 100644 --- a/include/display-internal.h +++ b/include/display-internal.h @@ -97,7 +97,7 @@ int device_display_get_max_brightness_state(int display_index, display_state_e s */ int device_display_set_brightness_state(int display_index, display_state_e state, int brightness); -typedef void (*dbus_pending_cb)(void *data, GVariant *result, GError *err); +typedef void (*device_dbus_pending_cb)(void *data, GVariant *result, GError *err); /** * @brief Change display state by a specific reason @@ -118,7 +118,7 @@ typedef void (*dbus_pending_cb)(void *data, GVariant *result, GError *err); * @retval #DEVICE_ERROR_OPERATION_FAILED Operation failed * @see device_display_change_state_by_reason() */ -int device_display_change_state_by_reason(display_state_e type, const char *reason, int timeout, dbus_pending_cb cb); +int device_display_change_state_by_reason(display_state_e type, const char *reason, int timeout, device_dbus_pending_cb cb); #ifdef __cplusplus } #endif diff --git a/include/touchscreen-internal.h b/include/touchscreen-internal.h index 6de6690..657118e 100644 --- a/include/touchscreen-internal.h +++ b/include/touchscreen-internal.h @@ -2,10 +2,9 @@ #define __TIZEN_SYSTEM_TOUCHSCREEN_INTERNAL_H__ #include +typedef void (*device_dbus_pending_cb)(void *data, GVariant *result, GError *err); -typedef void (*dbus_pending_cb)(void *data, GVariant *result, GError *err); - -int device_touchscreen_enable(dbus_pending_cb cb); -int device_touchscreen_disable(dbus_pending_cb cb); +int device_touchscreen_enable(device_dbus_pending_cb cb); +int device_touchscreen_disable(device_dbus_pending_cb cb); #endif diff --git a/src/dbus.c b/src/dbus.c index 1a28ffb..9562547 100644 --- a/src/dbus.c +++ b/src/dbus.c @@ -31,7 +31,7 @@ #define DBUS_MAXIMUM_NAME_LENGTH 255 struct pending_call_data { - dbus_pending_cb func; + device_dbus_pending_cb func; void *data; }; @@ -405,7 +405,7 @@ static void cb_pending(GDBusProxy *proxy, int dbus_method_async_with_reply_var(const char *dest, const char *path, const char *interface, const char *method, GVariant *param, - dbus_pending_cb cb, int timeout, void *data) + device_dbus_pending_cb cb, int timeout, void *data) { GDBusProxy *proxy; GError *err = NULL; @@ -457,7 +457,7 @@ int dbus_method_async_with_reply_var(const char *dest, const char *path, int dbus_method_async_with_reply(const char *dest, const char *path, const char *interface, const char *method, const char *sig, const char *param[], - dbus_pending_cb cb, int timeout, void *data) + device_dbus_pending_cb cb, int timeout, void *data) { return dbus_method_async_with_reply_var(dest, path, diff --git a/src/dbus.h b/src/dbus.h index 1bf4cdf..11cde7f 100644 --- a/src/dbus.h +++ b/src/dbus.h @@ -92,15 +92,15 @@ int dbus_method_sync_with_reply(const char *dest, * If result is NULL, err is set. * Do not invoke g_variant_unref() with result. */ -typedef void (*dbus_pending_cb)(void *data, GVariant *result, GError *err); +typedef void (*device_dbus_pending_cb)(void *data, GVariant *result, GError *err); int dbus_method_async_with_reply_var(const char *dest, const char *path, const char *interface, const char *method, GVariant *param, - dbus_pending_cb cb, int timeout, void *data); + device_dbus_pending_cb cb, int timeout, void *data); int dbus_method_async_with_reply(const char *dest, const char *path, const char *interface, const char *method, - const char *sig, const char *param[], dbus_pending_cb cb, int timeout, void *data); + const char *sig, const char *param[], device_dbus_pending_cb cb, int timeout, void *data); void restart_callback(void); diff --git a/src/display.c b/src/display.c index a5e1267..cc63847 100644 --- a/src/display.c +++ b/src/display.c @@ -412,7 +412,7 @@ int device_display_set_brightness_state(int display_index, display_state_e state return DEVICE_ERROR_NONE; } -int device_display_change_state_by_reason(display_state_e type, const char *reason, int timeout, dbus_pending_cb cb) +int device_display_change_state_by_reason(display_state_e type, const char *reason, int timeout, device_dbus_pending_cb cb) { int ret; diff --git a/src/touchscreen-internal.c b/src/touchscreen-internal.c index e7bdf35..f653420 100644 --- a/src/touchscreen-internal.c +++ b/src/touchscreen-internal.c @@ -22,7 +22,7 @@ #define METHOD_TOUCHSCREEN_DISABLE "Disable" //LCOV_EXCL_START Not used function -int device_touchscreen_enable(dbus_pending_cb cb) +int device_touchscreen_enable(device_dbus_pending_cb cb) { int ret; ret = dbus_method_async_with_reply(DEVICED_BUS_NAME, @@ -32,7 +32,7 @@ int device_touchscreen_enable(dbus_pending_cb cb) return errno_to_device_error(ret); } -int device_touchscreen_disable(dbus_pending_cb cb) +int device_touchscreen_disable(device_dbus_pending_cb cb) { int ret; ret = dbus_method_async_with_reply(DEVICED_BUS_NAME,