Fix casting warning

Change-Id: Ia0781461e5c6eaf5f01a4b1522eef852cfd5f415
Signed-off-by: pr.jung <pr.jung@samsung.com>

diff --git a/src/core/dbus.c b/src/core/dbus.c
index 2d22d15..f21a073 100644 (file)
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -182,11 +182,11 @@ static GDBusConnection * _get_bus_private(GBusType bus_type)
        }
 
        conn = g_dbus_connection_new_for_address_sync(address,
-                                                                               (GDBusConnectionFlags) (G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT |
-                                                                               G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION),
-                                                                               NULL, /* GDBusAuthObserver */
-                                                                               NULL,
-                                                                               &err);
+                       (GDBusConnectionFlags) (G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT |
+                       G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION),
+                       NULL, /* GDBusAuthObserver */
+                       NULL,
+                       &err);
        if (!conn || err) {
                _E("failed to get private bus\n");
                g_error_free(err);
@@ -779,7 +779,7 @@ static gint _compare_dbus_interface_by_id(gconstpointer a, gconstpointer b)
        dbus_interface_s * pa = (dbus_interface_s *)a;
        if (!pa->reg_id || !((guint*)b))
                return -1;
-       return !(pa->reg_id == (guint)b);
+       return !(pa->reg_id == *((guint*)b));
 }
 
 static gint _compare_dbus_method(gconstpointer a, gconstpointer b)
@@ -907,8 +907,8 @@ static int _dbus_handle_attach_object(dbus_handle_s *dh, const char *obj_path, d
 
 /* libgio verify path and interface */
 static void _method_call_handler(GDBusConnection *conn,
-       const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
-       GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
+               const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
+               GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        dbus_interface_s *iface_s = (dbus_interface_s *)user_data;
        const dbus_method_s *methods;
@@ -1003,8 +1003,8 @@ static int _dbus_handle_register_dbus_object(dbus_handle_h handle, const char *o
                g_dbus_connection_register_object ref(ifaceinfo) now, unref if object is unregistered
        */
        ret = g_dbus_connection_register_object(dh->conn, obj_path, ifaceinfo/*ref 2*/, &path_vtable, (void*)iface,
-               _free_func_object,
-               &err);
+                       _free_func_object,
+                       &err);
        if (err) {
                _E("failed to register object:err:%s:\n", err->message);
                ret = -1;
@@ -1342,9 +1342,9 @@ static void _free_func_signal(gpointer data)
 }
 
 guint subscribe_dbus_signal(dbus_handle_h handle, const char *path,
-                                                       const char *iface, const char *name,
-                                                       GDBusSignalCallback cb, void *data,
-                                                       destroy_notified free_func)
+               const char *iface, const char *name,
+               GDBusSignalCallback cb, void *data,
+               destroy_notified free_func)
 {
        dcl_dbus_handle();
 
@@ -1500,8 +1500,8 @@ static GVariant* _append_variant(const char *signature, const char *param[])
 }
 
 int dbus_handle_broadcast_dbus_signal(const char *path,
-                                                               const char *iface, const char *name,
-                                                               const char *signature, const char *param[])
+               const char *iface, const char *name,
+               const char *signature, const char *param[])
 {
        dbus_handle_s *dh = NULL;
        GError *err = NULL;
@@ -1526,8 +1526,8 @@ int dbus_handle_broadcast_dbus_signal(const char *path,
 }
 
 int dbus_handle_broadcast_dbus_signal_var(const char *path,
-                                                                                       const char *iface, const char *name,
-                                                                                       GVariant *param)
+               const char *iface, const char *name,
+               GVariant *param)
 {
        dbus_handle_s *dh = NULL;
        GError *err = NULL;
@@ -1549,8 +1549,8 @@ int dbus_handle_broadcast_dbus_signal_var(const char *path,
 }
 
 GVariant *dbus_method_sync_with_reply(const char *dest, const char *path,
-                                                                               const char *iface, const char *method,
-                                                                               const char *signature, const char *param[])
+               const char *iface, const char *method,
+               const char *signature, const char *param[])
 {
        GError *err = NULL;
        GVariant * var = NULL;
@@ -1572,8 +1572,8 @@ GVariant *dbus_method_sync_with_reply(const char *dest, const char *path,
                var = _append_variant(signature, param);
 
        ret = g_dbus_connection_call_sync(dh->conn,
-               dest, path, iface, method,
-               var, NULL, G_DBUS_CALL_FLAGS_NONE, DBUS_REPLY_TIMEOUT, NULL, &err);
+                       dest, path, iface, method,
+                       var, NULL, G_DBUS_CALL_FLAGS_NONE, DBUS_REPLY_TIMEOUT, NULL, &err);
        if (!ret || err) {
                if (err) {
                        _E("failed to g_dbus_connection_call_sync:%s", err->message);
@@ -1589,7 +1589,7 @@ GVariant *dbus_method_sync_with_reply(const char *dest, const char *path,
 }
 
 GVariant *dbus_method_sync_with_reply_var(const char *dest, const char *path,
-       const char *iface, const char *method, GVariant *var)
+               const char *iface, const char *method, GVariant *var)
 {
        GError *err = NULL;
        GVariant * ret = NULL;
@@ -1611,8 +1611,8 @@ GVariant *dbus_method_sync_with_reply_var(const char *dest, const char *path,
        }
 
        ret = g_dbus_connection_call_sync(dh->conn,
-                                                                               dest, path, iface, method,
-                                                                               var, NULL, G_DBUS_CALL_FLAGS_NONE, DBUS_REPLY_TIMEOUT, NULL, &err);
+                       dest, path, iface, method,
+                       var, NULL, G_DBUS_CALL_FLAGS_NONE, DBUS_REPLY_TIMEOUT, NULL, &err);
        if (!ret || err) {
                if (err) {
                        _E("failed to g_dbus_connection_call_sync:%s", err->message);
@@ -1650,10 +1650,10 @@ gint* dbus_handle_get_unix_fd_list(GDBusMethodInvocation *invocation, int *size)
 }
 
 GVariant *dbus_method_with_unix_fd_list_sync_with_reply(const char *dest, const char *path,
-                                                                                                               const char *iface, const char *method,
-                                                                                                               const char *signature, const char *param[],
-                                                                                                               int *in_fdlist, int in_size,
-                                                                                                               int **out_fdlist, int *out_size)
+               const char *iface, const char *method,
+               const char *signature, const char *param[],
+               int *in_fdlist, int in_size,
+               int **out_fdlist, int *out_size)
 {
        GError *err = NULL;
        GVariant * var = NULL;
@@ -1739,10 +1739,10 @@ out:
 }
 
 GVariant *dbus_method_with_unix_fd_list_sync_with_reply_var(const char *dest, const char *path,
-                                                                                                                       const char *iface, const char *method,
-                                                                                                                       GVariant *param,
-                                                                                                                       int *in_fdlist, int in_size,
-                                                                                                                       int **out_fdlist, int *out_size)
+               const char *iface, const char *method,
+               GVariant *param,
+               int *in_fdlist, int in_size,
+               int **out_fdlist, int *out_size)
 {
        GError *err = NULL;
        GVariant * ret = NULL;
@@ -1823,8 +1823,8 @@ out:
 }
 
 int dbus_method_sync(const char *dest, const char *path,
-                                               const char *iface, const char *method,
-                                               const char *signature, const char *param[])
+               const char *iface, const char *method,
+               const char *signature, const char *param[])
 {
        int result;
        gboolean result_bool;
@@ -1854,7 +1854,7 @@ int dbus_method_sync(const char *dest, const char *path,
 }
 
 int dbus_method_sync_var(const char *dest, const char *path,
-       const char *iface, const char *method, GVariant *param)
+               const char *iface, const char *method, GVariant *param)
 {
        int result;
        gboolean result_bool;
@@ -1884,8 +1884,8 @@ int dbus_method_sync_var(const char *dest, const char *path,
 }
 
 int dbus_method_sync_timeout(const char *dest, const char *path,
-                                                               const char *iface, const char *method,
-                                                               const char *signature, const char *param[], int timeout)
+               const char *iface, const char *method,
+               const char *signature, const char *param[], int timeout)
 {
        dbus_handle_s *dh = NULL;
        GError *err = NULL;
@@ -1908,8 +1908,8 @@ int dbus_method_sync_timeout(const char *dest, const char *path,
                var = _append_variant(signature, param);
 
        reply = g_dbus_connection_call_sync(dh->conn,
-                                                                               dest, path, iface, method,
-                                                                               var, NULL, G_DBUS_CALL_FLAGS_NONE, timeout, NULL, &err);
+                       dest, path, iface, method,
+                       var, NULL, G_DBUS_CALL_FLAGS_NONE, timeout, NULL, &err);
        if (!reply || err) {
                _E("failed to g_dbus_connection_call_sync:%s", err->message);
                g_error_free(err);
@@ -1927,8 +1927,8 @@ int dbus_method_sync_timeout(const char *dest, const char *path,
 }
 
 int dbus_method_sync_pairs(const char *dest, const char *path,
-                                                       const char *iface, const char *method,
-                                                       int num, va_list args)
+               const char *iface, const char *method,
+               int num, va_list args)
 {
        GError *err = NULL;
        GVariant * reply = NULL;
@@ -1979,8 +1979,8 @@ int dbus_method_sync_pairs(const char *dest, const char *path,
 }
 
 int dbus_method_async_pairs(const char *dest, const char *path,
-       const char *iface, const char *method,
-       int num, va_list args)
+               const char *iface, const char *method,
+               int num, va_list args)
 {
        char *key, *value;
        GVariant *var;
@@ -2011,16 +2011,16 @@ int dbus_method_async_pairs(const char *dest, const char *path,
        var = g_variant_new("(a{ss})", builder);
 
        g_dbus_connection_call(dh->conn, dest, path, iface, method,
-               var, NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL,
-               NULL,
-               NULL);
+                       var, NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL,
+                       NULL,
+                       NULL);
 
        return 0;
 }
 
 int dbus_method_async(const char *dest, const char *path,
-       const char *iface, const char *method,
-       const char *signature, const char *param[])
+               const char *iface, const char *method,
+               const char *signature, const char *param[])
 {
        GVariant * var = NULL;
        dbus_handle_s *dh = NULL;
@@ -2040,15 +2040,15 @@ int dbus_method_async(const char *dest, const char *path,
                var = _append_variant(signature, param);
 
        g_dbus_connection_call(dh->conn, dest, path, iface, method,
-                                                       var, NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL,
-                                                       NULL,
-                                                       NULL);
+                       var, NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL,
+                       NULL,
+                       NULL);
 
        return 0;
 }
 
 int dbus_method_async_var(const char *dest, const char *path,
-       const char *iface, const char *method, GVariant *param)
+               const char *iface, const char *method, GVariant *param)
 {
        dbus_handle_s *dh = NULL;
 
@@ -2064,17 +2064,17 @@ int dbus_method_async_var(const char *dest, const char *path,
        }
 
        g_dbus_connection_call(dh->conn, dest, path, iface, method,
-               param, NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL,
-               NULL,
-               NULL);
+                       param, NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL,
+                       NULL,
+                       NULL);
 
        return 0;
 }
 
 /* callback should free gvariant */
 static void _cb_pending(GDBusConnection *conn,
-                                               GAsyncResult    *res,
-                                               gpointer         user_data)
+               GAsyncResult    *res,
+               gpointer         user_data)
 {
        GVariant *reply = NULL;
        GError *err = NULL;
@@ -2102,14 +2102,14 @@ out:
 }
 
 int dbus_method_async_with_reply(const char *dest,
-                                                                       const char *path,
-                                                                       const char *iface,
-                                                                       const char *method,
-                                                                       const char *signature,
-                                                                       const char *param[],
-                                                                       dbus_pending_cb cb,
-                                                                       int timeout_msec,
-                                                                       void *data)
+               const char *path,
+               const char *iface,
+               const char *method,
+               const char *signature,
+               const char *param[],
+               dbus_pending_cb cb,
+               int timeout_msec,
+               void *data)
 {
        dbus_handle_s *dh = NULL;
        pending_call_data *pdata = NULL;
@@ -2146,9 +2146,9 @@ int dbus_method_async_with_reply(const char *dest,
                pdata->data = data;
        }
        g_dbus_connection_call(dh->conn, dest, path, iface, method,
-                                                       var, NULL, G_DBUS_CALL_FLAGS_NONE, timeout_msec, NULL,
-                                                       (GAsyncReadyCallback)_cb_pending,
-                                                       pdata);
+                       var, NULL, G_DBUS_CALL_FLAGS_NONE, timeout_msec, NULL,
+                       (GAsyncReadyCallback)_cb_pending,
+                       pdata);
 
        return ret;
 err:
@@ -2158,13 +2158,13 @@ err:
 }
 
 int dbus_method_async_with_reply_var(const char *dest,
-                                                                               const char *path,
-                                                                               const char *iface,
-                                                                               const char *method,
-                                                                               GVariant *param,
-                                                                               dbus_pending_cb cb,
-                                                                               int timeout_msec,
-                                                                               void *data)
+               const char *path,
+               const char *iface,
+               const char *method,
+               GVariant *param,
+               dbus_pending_cb cb,
+               int timeout_msec,
+               void *data)
 {
        dbus_handle_s *dh = NULL;
        pending_call_data *pdata = NULL;
@@ -2197,9 +2197,9 @@ int dbus_method_async_with_reply_var(const char *dest,
                pdata->data = data;
        }
        g_dbus_connection_call(dh->conn, dest, path, iface, method,
-               param, NULL, G_DBUS_CALL_FLAGS_NONE, timeout_msec, NULL,
-               (GAsyncReadyCallback)_cb_pending,
-               pdata);
+                       param, NULL, G_DBUS_CALL_FLAGS_NONE, timeout_msec, NULL,
+                       (GAsyncReadyCallback)_cb_pending,
+                       pdata);
 
        return ret;
 err:
@@ -2224,13 +2224,13 @@ int dbus_connection_get_sender_pid(GDBusConnection *conn, const char * sender)
        }
 
        vret = g_dbus_connection_call_sync(conn,
-               "org.freedesktop.DBus", "/", "org.freedesktop.DBus", "GetConnectionUnixProcessID",
-               g_variant_new("(s)", sender),
-               NULL,
-               G_DBUS_CALL_FLAGS_NONE,
-               DBUS_REPLY_TIMEOUT,
-               NULL,
-               &err);
+                       "org.freedesktop.DBus", "/", "org.freedesktop.DBus", "GetConnectionUnixProcessID",
+                       g_variant_new("(s)", sender),
+                       NULL,
+                       G_DBUS_CALL_FLAGS_NONE,
+                       DBUS_REPLY_TIMEOUT,
+                       NULL,
+                       &err);
        if (!vret || err) {
                _E("failed to g_dbus_connection_call_sync:%s", err->message);
                g_error_free(err);
@@ -2279,8 +2279,17 @@ int dbus_handle_get_sender_credentials(dbus_handle_h handle, const char *name, G
                        return -1;
                }
        }
-       vret = g_dbus_connection_call_sync(dh->conn, DBUS_BUS_NAME, DBUS_OBJECT_PATH, DBUS_INTERFACE_NAME,
-               "GetConnectionCredentials", g_variant_new("(s)", name), NULL, G_DBUS_CALL_FLAGS_NONE, DBUS_REPLY_TIMEOUT, NULL, &err);
+       vret = g_dbus_connection_call_sync(dh->conn,
+                       DBUS_BUS_NAME,
+                       DBUS_OBJECT_PATH,
+                       DBUS_INTERFACE_NAME,
+                       "GetConnectionCredentials",
+                       g_variant_new("(s)", name),
+                       NULL,
+                       G_DBUS_CALL_FLAGS_NONE,
+                       DBUS_REPLY_TIMEOUT,
+                       NULL,
+                       &err);
        if (!vret || err) {
                _E("failed to g_dbus_connection_call_sync:%s", err->message);
                return -1;
@@ -2316,9 +2325,9 @@ void _destroy_notify_watch_name(gpointer data)
 }
 
 int dbus_handle_watch_name(const char *name,
-                                                       GBusNameAppearedCallback  name_appeared_handler,
-                                                       GBusNameVanishedCallback  name_vanished_handler,
-                                                       void *user_data)
+               GBusNameAppearedCallback  name_appeared_handler,
+               GBusNameVanishedCallback  name_vanished_handler,
+               void *user_data)
 {
        guint id = 0;
 
@@ -2331,7 +2340,13 @@ int dbus_handle_watch_name(const char *name,
                return -1;
        }
 
-       id = g_bus_watch_name(dbus_handle_get_default_bus_type(), name, G_BUS_NAME_WATCHER_FLAGS_NONE, name_appeared_handler, name_vanished_handler, user_data, _destroy_notify_watch_name);
+       id = g_bus_watch_name(dbus_handle_get_default_bus_type(),
+                       name,
+                       G_BUS_NAME_WATCHER_FLAGS_NONE,
+                       name_appeared_handler,
+                       name_vanished_handler,
+                       user_data,
+                       _destroy_notify_watch_name);
        if (!id) {
                _E("failed to g_bus_watch_name");
                return -1;
@@ -2410,13 +2425,13 @@ char **dbus_handle_get_owner_list(dbus_handle_h handle, const char *bus_name)
        }
 
        vret = g_dbus_connection_call_sync(dh->conn,
-               "org.freedesktop.DBus", "/", "org.freedesktop.DBus", "ListQueuedOwners",
-               g_variant_new("(s)", bus_name),
-               NULL,
-               G_DBUS_CALL_FLAGS_NONE,
-               DBUS_REPLY_TIMEOUT,
-               NULL,
-               &err);
+                       "org.freedesktop.DBus", "/", "org.freedesktop.DBus", "ListQueuedOwners",
+                       g_variant_new("(s)", bus_name),
+                       NULL,
+                       G_DBUS_CALL_FLAGS_NONE,
+                       DBUS_REPLY_TIMEOUT,
+                       NULL,
+                       &err);
        if (!vret || err) {
                _E("failed to g_dbus_connection_call_sync:%s", err->message);
                g_error_free(err);