util: gdbus: Rename gdbus-util functions by removing the specific module name

Rename gdbus-util functions by removing the specific module name
without any behavior changes.

Change-Id: I5d0265a985443a628d1265c371c444686ba7d88e
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/include/util/gdbus-util.h b/include/util/gdbus-util.h
index 2f8e078..a5dbc44 100644 (file)
--- a/include/util/gdbus-util.h
+++ b/include/util/gdbus-util.h
@@ -29,34 +29,34 @@
 
 #include "gdbus-definition.h"
 
-struct pass_gdbus_signal_info {
+struct gdbus_signal_info {
        const gchar *handler;
        GCallback cb;
        gpointer cb_data;
        gulong ret_id;
 };
 
-int pass_gdbus_register_systemd_startup_callback(GDBusSignalCallback cb,
+int gdbus_register_systemd_startup_callback(GDBusSignalCallback cb,
                gpointer user_data, guint *id);
-int pass_gdbus_unregister_systemd_startup_callback(guint id);
-int pass_gdbus_get_systemd_dbus_property_string(const char *iface,
+int gdbus_unregister_systemd_startup_callback(guint id);
+int gdbus_get_systemd_dbus_property_string(const char *iface,
                const char *prop, const char **value);
-int pass_gdbus_export_interface(passdbus idx, gpointer instance, const char *obj_path);
-int pass_gdbus_get_name(passdbus idx, const char *name);
-int pass_gdbus_connect_signal(gpointer instance, int num_signals,
-               struct pass_gdbus_signal_info *signal_infos);
-void pass_gdbus_disconnect_signal(gpointer instance, int num_signals,
-               struct pass_gdbus_signal_info *signal_infos);
-int pass_gdbus_send_broadcast_signal(passdbus idx, char *path, char *interface,
+int gdbus_export_interface(passdbus idx, gpointer instance, const char *obj_path);
+int gdbus_get_name(passdbus idx, const char *name);
+int gdbus_connect_signal(gpointer instance, int num_signals,
+               struct gdbus_signal_info *signal_infos);
+void gdbus_disconnect_signal(gpointer instance, int num_signals,
+               struct gdbus_signal_info *signal_infos);
+int gdbus_send_broadcast_signal(passdbus idx, char *path, char *interface,
                char *method, GVariant *arg);
 
-SystemPassCore *pass_gdbus_get_instance_core(void);
-void pass_gdbus_put_instance_core(SystemPassCore **instance);
-SystemPassPmqos *pass_gdbus_get_instance_pmqos(void);
-void pass_gdbus_put_instance_pmqos(SystemPassPmqos **instance);
-SystemThermal *pass_gdbus_get_instance_thermal(void);
-void pass_gdbus_put_instance_thermal(SystemThermal **instance);
+SystemPassCore *gdbus_get_instance_core(void);
+void gdbus_put_instance_core(SystemPassCore **instance);
+SystemPassPmqos *gdbus_get_instance_pmqos(void);
+void gdbus_put_instance_pmqos(SystemPassPmqos **instance);
+SystemThermal *gdbus_get_instance_thermal(void);
+void gdbus_put_instance_thermal(SystemThermal **instance);
 
-int pass_gdbus_get_system_connection(passdbus idx);
-void pass_gdbus_put_system_connection(passdbus idx);
+int gdbus_get_system_connection(passdbus idx);
+void gdbus_put_system_connection(passdbus idx);
 #endif /* __GDBUS_UTIL_H__ */

diff --git a/src/main.c b/src/main.c
index bbcd618..91f925f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -51,7 +51,7 @@ static int late_init(void)
        signal(SIGTERM, sig_quit);
        signal(SIGUSR1, sig_usr1);
 
-       ret = pass_gdbus_get_name(PASS_DBUS_CORE, DBUS_PASS_BUS_NAME);
+       ret = gdbus_get_name(PASS_DBUS_CORE, DBUS_PASS_BUS_NAME);
        if (ret < 0)
                return ret;
 
@@ -63,7 +63,7 @@ static int late_init(void)
 int main(int argc, char **argv)
 {
        g_mainloop = g_main_loop_new(NULL, FALSE);
-       pass_gdbus_get_system_connection(PASS_DBUS_CORE);
+       gdbus_get_system_connection(PASS_DBUS_CORE);
 
        init_timer();
        init_devices(NULL);
@@ -74,7 +74,7 @@ int main(int argc, char **argv)
        exit_devices(NULL);
        exit_timer();
 
-       pass_gdbus_put_system_connection(PASS_DBUS_CORE);
+       gdbus_put_system_connection(PASS_DBUS_CORE);
        g_main_loop_unref(g_mainloop);
 
        return 0;

diff --git a/src/pass/pass.c b/src/pass/pass.c
index ac70225..a0c1a6e 100644 (file)
--- a/src/pass/pass.c
+++ b/src/pass/pass.c
@@ -177,7 +177,7 @@ static gboolean dbus_cb_core_stop(SystemPassCore *obj,
  *             and callback function pointer which is executed when receives
  *             the defined signal.
  */
-static struct pass_gdbus_signal_info g_gdbus_signal_infos[] = {
+static struct gdbus_signal_info g_gdbus_signal_infos[] = {
        {
                .handler = DBUS_CORE_I_START_HANDLER,
                .cb = G_CALLBACK(dbus_cb_core_start),
@@ -514,9 +514,9 @@ static void pass_exit(void *data)
        unregister_notifier(DEVICE_NOTIFIER_INIT_DONE,
                        pass_init_done, NULL);
 
-       pass_gdbus_disconnect_signal(g_gdbus_instance,
+       gdbus_disconnect_signal(g_gdbus_instance,
                        ARRAY_SIZE(g_gdbus_signal_infos), g_gdbus_signal_infos);
-       pass_gdbus_put_instance_core(&g_gdbus_instance);
+       gdbus_put_instance_core(&g_gdbus_instance);
 
        pass_exit_done();
 
@@ -537,14 +537,14 @@ static int pass_probe(void *data)
 
        g_pass.state = PASS_OFF;
 
-       g_gdbus_instance = pass_gdbus_get_instance_core();
+       g_gdbus_instance = gdbus_get_instance_core();
        if (g_gdbus_instance == NULL) {
                _E("cannot get a dbus instance for the %s interface\n",
                                DBUS_CORE_INTERFACE);
                return -ENOSYS;
        }
 
-       ret = pass_gdbus_connect_signal(g_gdbus_instance,
+       ret = gdbus_connect_signal(g_gdbus_instance,
                        ARRAY_SIZE(g_gdbus_signal_infos), g_gdbus_signal_infos);
        if (ret < 0) {
                _E("cannot register callbacks as the dbus method invocation "
@@ -553,7 +553,7 @@ static int pass_probe(void *data)
                goto out;
        }
 
-       ret = pass_gdbus_export_interface(PASS_DBUS_CORE,
+       ret = gdbus_export_interface(PASS_DBUS_CORE,
                        g_gdbus_instance, DBUS_CORE_PATH);
        if (ret < 0) {
                _E("cannot export the dbus interface '%s' "
@@ -580,10 +580,10 @@ static int pass_probe(void *data)
        return 0;
 
 out_disconnect:
-       pass_gdbus_disconnect_signal(g_gdbus_instance,
+       gdbus_disconnect_signal(g_gdbus_instance,
                        ARRAY_SIZE(g_gdbus_signal_infos), g_gdbus_signal_infos);
 out:
-       pass_gdbus_put_instance_core(&g_gdbus_instance);
+       gdbus_put_instance_core(&g_gdbus_instance);
 
        return ret;
 }

diff --git a/src/pmqos/pmqos.c b/src/pmqos/pmqos.c
index 404b9ca..91476c6 100644 (file)
--- a/src/pmqos/pmqos.c
+++ b/src/pmqos/pmqos.c
@@ -241,7 +241,7 @@ static gboolean dbus_cb_pmqos_legacy_scenario(SystemPassPmqos *obj,
  *             feature. It contains the signal name and callback function
  *             pointer which is executed when receives the defined signal.
  */
-static struct pass_gdbus_signal_info g_gdbus_signal_infos[] = {
+static struct gdbus_signal_info g_gdbus_signal_infos[] = {
        {
                .handler = DBUS_PMQOS_I_APPLAUNCH_HANDLER,
                .cb = G_CALLBACK(dbus_cb_pmqos_legacy_scenario),
@@ -596,9 +596,9 @@ static void pmqos_exit(void *data)
        unregister_notifier(DEVICE_NOTIFIER_INIT_DONE,
                        pmqos_init_done, NULL);
 
-       pass_gdbus_disconnect_signal(g_gdbus_instance,
+       gdbus_disconnect_signal(g_gdbus_instance,
                        ARRAY_SIZE(g_gdbus_signal_infos), g_gdbus_signal_infos);
-       pass_gdbus_put_instance_pmqos(&g_gdbus_instance);
+       gdbus_put_instance_pmqos(&g_gdbus_instance);
 
        pmqos_free();
 }
@@ -615,14 +615,14 @@ static int pmqos_probe(void *data)
 {
        int ret = 0;
 
-       g_gdbus_instance = pass_gdbus_get_instance_pmqos();
+       g_gdbus_instance = gdbus_get_instance_pmqos();
        if (!g_gdbus_instance) {
                _E("cannot get a dbus instance for the %s interface\n",
                                DBUS_PMQOS_INTERFACE);
                return -ENOSYS;
        }
 
-       ret = pass_gdbus_connect_signal(g_gdbus_instance,
+       ret = gdbus_connect_signal(g_gdbus_instance,
                        ARRAY_SIZE(g_gdbus_signal_infos), g_gdbus_signal_infos);
        if (ret < 0) {
                _E("cannot register callbacks as the dbus method invocation "
@@ -631,7 +631,7 @@ static int pmqos_probe(void *data)
                goto out;
        }
 
-       ret = pass_gdbus_export_interface(PASS_DBUS_CORE,
+       ret = gdbus_export_interface(PASS_DBUS_CORE,
                        g_gdbus_instance, DBUS_PMQOS_PATH);
        if (ret < 0) {
                _E("cannot export the dbus interface '%s' "
@@ -658,10 +658,10 @@ static int pmqos_probe(void *data)
        return 0;
 
 out_disconnect:
-       pass_gdbus_disconnect_signal(g_gdbus_instance,
+       gdbus_disconnect_signal(g_gdbus_instance,
                        ARRAY_SIZE(g_gdbus_signal_infos), g_gdbus_signal_infos);
 out:
-       pass_gdbus_put_instance_pmqos(&g_gdbus_instance);
+       gdbus_put_instance_pmqos(&g_gdbus_instance);
 
        return ret;
 

diff --git a/src/thermal/thermal.c b/src/thermal/thermal.c
index 037e84a..60440ab 100644 (file)
--- a/src/thermal/thermal.c
+++ b/src/thermal/thermal.c
@@ -246,7 +246,7 @@ static gboolean dbus_cb_thermal_stop(SystemThermal *obj,
  *             function pointer which is executed when receives the defined
  *             signal.
  */
-static struct pass_gdbus_signal_info g_gdbus_signal_infos[] = {
+static struct gdbus_signal_info g_gdbus_signal_infos[] = {
        {
                .handler = DBUS_THERMAL_I_START_HANDLER,
                .cb = G_CALLBACK(dbus_cb_thermal_start),
@@ -381,7 +381,7 @@ static int thermal_notifier_cb(void *data, void *user_data)
 
        /* If there is available thermal scenario, send the broadcast signal */
        gvar = g_variant_new("(s)", scenario);
-       ret = pass_gdbus_send_broadcast_signal(PASS_DBUS_THERMAL,
+       ret = gdbus_send_broadcast_signal(PASS_DBUS_THERMAL,
                                        DBUS_THERMAL_PATH,
                                        DBUS_THERMAL_INTERFACE,
                                        DBUS_THERMAL_SIGNAL,
@@ -419,11 +419,11 @@ static void thermal_exit(void *data)
        unregister_notifier(DEVICE_NOTIFIER_INIT_DONE,
                        thermal_init_done, NULL);
 
-       pass_gdbus_disconnect_signal(g_gdbus_instance,
+       gdbus_disconnect_signal(g_gdbus_instance,
                        ARRAY_SIZE(g_gdbus_signal_infos), g_gdbus_signal_infos);
-       pass_gdbus_put_instance_thermal(&g_gdbus_instance);
+       gdbus_put_instance_thermal(&g_gdbus_instance);
 
-       pass_gdbus_put_system_connection(PASS_DBUS_THERMAL);
+       gdbus_put_system_connection(PASS_DBUS_THERMAL);
 
        thermal_free();
 }
@@ -440,14 +440,14 @@ static int thermal_probe(void *data)
 {
        int ret = 0;
 
-       ret = pass_gdbus_get_system_connection(PASS_DBUS_THERMAL);
+       ret = gdbus_get_system_connection(PASS_DBUS_THERMAL);
        if (ret < 0) {
                _E("Failed to get system connection for thermal");
                return -ENOENT;
        }
 
        /* Initialize the d-bus interface for Thermal Monitor */
-       g_gdbus_instance = pass_gdbus_get_instance_thermal();
+       g_gdbus_instance = gdbus_get_instance_thermal();
        if (!g_gdbus_instance) {
                _E("failed to get a dbus instance for the %s interface\n",
                                DBUS_THERMAL_INTERFACE);
@@ -455,14 +455,14 @@ static int thermal_probe(void *data)
                goto out;
        }
 
-       ret = pass_gdbus_get_name(PASS_DBUS_THERMAL, DBUS_THERMAL_BUS_NAME);
+       ret = gdbus_get_name(PASS_DBUS_THERMAL, DBUS_THERMAL_BUS_NAME);
        if (ret < 0) {
                _E("Failed to own dbus name '%s'\n", DBUS_THERMAL_BUS_NAME);
                ret = -EINVAL;
                goto out;
        }
 
-       ret = pass_gdbus_connect_signal(g_gdbus_instance,
+       ret = gdbus_connect_signal(g_gdbus_instance,
                        ARRAY_SIZE(g_gdbus_signal_infos), g_gdbus_signal_infos);
        if (ret < 0) {
                _E("failed to register callbacks as the dbus method invocation "
@@ -471,7 +471,7 @@ static int thermal_probe(void *data)
                goto out_put_instance;
        }
 
-       ret = pass_gdbus_export_interface(PASS_DBUS_THERMAL,
+       ret = gdbus_export_interface(PASS_DBUS_THERMAL,
                        g_gdbus_instance, DBUS_THERMAL_PATH);
        if (ret < 0) {
                _E("failed to export the dbus interface '%s' "
@@ -510,12 +510,12 @@ out_booting_done:
        unregister_notifier(DEVICE_NOTIFIER_INIT_DONE,
                        thermal_init_done, NULL);
 out_disconnect:
-       pass_gdbus_disconnect_signal(g_gdbus_instance,
+       gdbus_disconnect_signal(g_gdbus_instance,
                        ARRAY_SIZE(g_gdbus_signal_infos), g_gdbus_signal_infos);
 out_put_instance:
-       pass_gdbus_put_instance_thermal(&g_gdbus_instance);
+       gdbus_put_instance_thermal(&g_gdbus_instance);
 out:
-       pass_gdbus_put_system_connection(PASS_DBUS_THERMAL);
+       gdbus_put_system_connection(PASS_DBUS_THERMAL);
 
        return ret;
 }

diff --git a/src/util/gdbus-util.c b/src/util/gdbus-util.c
index b4fcafe..17c25c2 100644 (file)
--- a/src/util/gdbus-util.c
+++ b/src/util/gdbus-util.c
@@ -26,7 +26,7 @@
 static GDBusConnection *g_dbus_sys_conn[PASS_DBUS_MAX] = {NULL, };
 static int dbus_name_owned;
 
-int pass_gdbus_export_interface(passdbus idx, gpointer instance,
+int gdbus_export_interface(passdbus idx, gpointer instance,
                                const char *obj_path)
 {
        gboolean ret;
@@ -53,14 +53,14 @@ int pass_gdbus_export_interface(passdbus idx, gpointer instance,
        return -1;
 }
 
-static void pass_name_acquired_cb(GDBusConnection *connection,
+static void name_acquired_cb(GDBusConnection *connection,
                                const gchar *name, gpointer user_data)
 {
        if (++dbus_name_owned == PASS_DBUS_MAX)
                sd_notify(0, "READY=1");
 }
 
-int pass_gdbus_get_name(passdbus idx, const char *name)
+int gdbus_get_name(passdbus idx, const char *name)
 {
        guint id;
 
@@ -71,15 +71,15 @@ int pass_gdbus_get_name(passdbus idx, const char *name)
 
        id = g_bus_own_name_on_connection(g_dbus_sys_conn[idx], name,
                        G_BUS_NAME_OWNER_FLAGS_NONE,
-                       pass_name_acquired_cb, NULL, NULL, NULL);
+                       name_acquired_cb, NULL, NULL, NULL);
        if (id == 0)
                return -ENOSYS;
 
        return 0;
 }
 
-int pass_gdbus_connect_signal(gpointer instance, int num_signals,
-               struct pass_gdbus_signal_info *signal_infos)
+int gdbus_connect_signal(gpointer instance, int num_signals,
+               struct gdbus_signal_info *signal_infos)
 {
        int i;
        unsigned long handler_id;
@@ -108,8 +108,8 @@ out_err:
        return -EINVAL;
 }
 
-void pass_gdbus_disconnect_signal(gpointer instance, int num_signals,
-               struct pass_gdbus_signal_info *signal_infos)
+void gdbus_disconnect_signal(gpointer instance, int num_signals,
+               struct gdbus_signal_info *signal_infos)
 {
        int i;
 
@@ -122,7 +122,7 @@ void pass_gdbus_disconnect_signal(gpointer instance, int num_signals,
        }
 }
 
-int pass_gdbus_send_broadcast_signal(passdbus idx, char *path,
+int gdbus_send_broadcast_signal(passdbus idx, char *path,
                char *interface, char *method, GVariant *arg)
 {
        GDBusMessage *message = NULL;
@@ -173,37 +173,37 @@ static void put_instance(gpointer *instance)
        *instance = NULL;
 }
 
-SystemPassCore *pass_gdbus_get_instance_core(void)
+SystemPassCore *gdbus_get_instance_core(void)
 {
        return system_pass_core_skeleton_new();
 }
 
-void pass_gdbus_put_instance_core(SystemPassCore **instance)
+void gdbus_put_instance_core(SystemPassCore **instance)
 {
        put_instance((gpointer *)instance);
 }
 
-SystemPassPmqos *pass_gdbus_get_instance_pmqos(void)
+SystemPassPmqos *gdbus_get_instance_pmqos(void)
 {
        return system_pass_pmqos_skeleton_new();
 }
 
-void pass_gdbus_put_instance_pmqos(SystemPassPmqos **instance)
+void gdbus_put_instance_pmqos(SystemPassPmqos **instance)
 {
        put_instance((gpointer *)instance);
 }
 
-SystemThermal *pass_gdbus_get_instance_thermal(void)
+SystemThermal *gdbus_get_instance_thermal(void)
 {
        return system_thermal_skeleton_new();
 }
 
-void pass_gdbus_put_instance_thermal(SystemThermal **instance)
+void gdbus_put_instance_thermal(SystemThermal **instance)
 {
        put_instance((gpointer *)instance);
 }
 
-int pass_gdbus_get_system_connection(passdbus idx)
+int gdbus_get_system_connection(passdbus idx)
 {
        GError *error = NULL;
 
@@ -223,7 +223,7 @@ int pass_gdbus_get_system_connection(passdbus idx)
        return 0;
 }
 
-void pass_gdbus_put_system_connection(passdbus idx)
+void gdbus_put_system_connection(passdbus idx)
 {
        if (idx >= PASS_DBUS_MAX) {
                _E("Invalid DBUS connection: %d\n", idx);