diff options
author | Hyotaek Shim <hyotaek.shim@samsung.com> | 2019-08-01 11:05:55 +0900 |
---|---|---|
committer | Hyotaek Shim <hyotaek.shim@samsung.com> | 2019-08-01 11:05:55 +0900 |
commit | 74f7ef7170e338de013749859284b00c55f18e6b (patch) | |
tree | 7420ab6cdbfa03141b3ddf135196b50a541d4e59 | |
parent | 71f652f544ee52780874bc0cf5f4d551f6f3e90b (diff) | |
download | activationd-74f7ef7170e338de013749859284b00c55f18e6b.tar.gz activationd-74f7ef7170e338de013749859284b00c55f18e6b.tar.bz2 activationd-74f7ef7170e338de013749859284b00c55f18e6b.zip |
Remove glib dependency from include/unit_control.hsubmit/tizen/20190801.020645accepted/tizen/unified/20190801.113337
Change-Id: I1289fbc4a2bc019b2f34d17f5dedfef292561c45
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>
-rw-r--r-- | include/unit_control.h | 24 | ||||
-rw-r--r-- | src/libactd/unit_control.c | 26 |
2 files changed, 26 insertions, 24 deletions
diff --git a/include/unit_control.h b/include/unit_control.h index 1164746..6efa69c 100644 --- a/include/unit_control.h +++ b/include/unit_control.h @@ -1,23 +1,25 @@ #ifndef UNIT_CONTROL_H #define UNIT_CONTROL_H -#include <glib.h> -#include <glib/gi18n.h> -#include <gio/gio.h> - enum { UNIT_CONTROL_OK, UNIT_CONTROL_ERROR, }; -typedef void (*actd_unit_cb)(int status, void *user_data, GError *err); +typedef enum +{ + BUS_TYPE_SYSTEM = 1, + BUS_TYPE_SESSION = 2 +} BusType; + +typedef void (*actd_unit_cb)(int status, void *user_data); -int actd_start_unit(GBusType bus_type, const char *unit, int timeout); -int actd_stop_unit(GBusType bus_type, const char *unit, int timeout); -int actd_restart_unit(GBusType bus_type, const char *unit, int timeout); +int actd_start_unit(BusType bus_type, const char *unit, int timeout); +int actd_stop_unit(BusType bus_type, const char *unit, int timeout); +int actd_restart_unit(BusType bus_type, const char *unit, int timeout); -int actd_start_unit_async(GBusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout); -int actd_stop_unit_async(GBusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout); -int actd_restart_unit_async(GBusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout); +int actd_start_unit_async(BusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout); +int actd_stop_unit_async(BusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout); +int actd_restart_unit_async(BusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout); #endif /* UNIT_CONTROL_H */ diff --git a/src/libactd/unit_control.c b/src/libactd/unit_control.c index 6496a01..e6c66b5 100644 --- a/src/libactd/unit_control.c +++ b/src/libactd/unit_control.c @@ -76,7 +76,7 @@ static void generic_callback(GObject *source_object, GAsyncResult *res, gpointer break; } - data->cb(status, data->user_data, err); + data->cb(status, data->user_data); if (err) g_error_free(err); @@ -200,32 +200,32 @@ static int call_uc_async(GBusType bus_type, const char *method, const char *unit return 0; } -int actd_start_unit(GBusType bus_type, const char *unit, int timeout) +int actd_start_unit(BusType bus_type, const char *unit, int timeout) { - return call_uc(bus_type, "Start", unit, timeout); + return call_uc((GBusType)bus_type, "Start", unit, timeout); } -int actd_stop_unit(GBusType bus_type, const char *unit, int timeout) +int actd_stop_unit(BusType bus_type, const char *unit, int timeout) { - return call_uc(bus_type, "Stop", unit, timeout); + return call_uc((GBusType)bus_type, "Stop", unit, timeout); } -int actd_restart_unit(GBusType bus_type, const char *unit, int timeout) +int actd_restart_unit(BusType bus_type, const char *unit, int timeout) { - return call_uc(bus_type, "Restart", unit, timeout); + return call_uc((GBusType)bus_type, "Restart", unit, timeout); } -int actd_start_unit_async(GBusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout) +int actd_start_unit_async(BusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout) { - return call_uc_async(bus_type, "Start", unit, cb, user_data, timeout); + return call_uc_async((GBusType)bus_type, "Start", unit, cb, user_data, timeout); } -int actd_stop_unit_async(GBusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout) +int actd_stop_unit_async(BusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout) { - return call_uc_async(bus_type, "Stop", unit, cb, user_data, timeout); + return call_uc_async((GBusType)bus_type, "Stop", unit, cb, user_data, timeout); } -int actd_restart_unit_async(GBusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout) +int actd_restart_unit_async(BusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout) { - return call_uc_async(bus_type, "Restart", unit, cb, user_data, timeout); + return call_uc_async((GBusType)bus_type, "Restart", unit, cb, user_data, timeout); } |