Fix build warning based on GCC-9

[platform/core/appfw/libeventsystem.git] / src / eventsystem.c

diff --git a/src/eventsystem.c b/src/eventsystem.c
index 587ef35..7c4d4ec 100644 (file)
--- a/src/eventsystem.c
+++ b/src/eventsystem.c
@@ -114,7 +114,7 @@ static eventmap_s *__create_eventmap(const char *interface_name,
                int event_type, eventsystem_cb callback, void *user_data);
 static void __destroy_eventmap(gpointer data);
 static int __eventsystem_launch_on_event_for_userevent(const char *event_name,
-               bundle *data, const bool trusted);
+               bundle *data, gboolean trusted);
 
 static int __event_compare_reg_id_cb(gconstpointer a, gconstpointer b)
 {
@@ -611,7 +611,6 @@ static int __eventsystem_register_event_internal(const char *event_name,
        char *interface_name;
        char *object_path;
        char *member_name;
-       char *sender_name = NULL;
        GDBusSignalCallback filter;
        GBusType bus_type;
        guint subscription_id = 0;
@@ -677,7 +676,6 @@ static int __eventsystem_register_event_internal(const char *event_name,
                ret = ES_R_ERROR;
                goto out_3;
        }
-       sender_name = NULL;
 
        bus_type = G_BUS_TYPE_SYSTEM;
 
@@ -694,7 +692,7 @@ static int __eventsystem_register_event_internal(const char *event_name,
        }
 
        subscription_id = g_dbus_connection_signal_subscribe(conn,
-               sender_name, /* sender */
+               NULL, /* sender */
                interface_name,
                member_name, /* member */
                object_path, /* object_path */
@@ -974,7 +972,7 @@ int eventsystem_send_user_event(const char *event_name, bundle *data, bool is_tr
                                goto out;
                        }
 
-                       if (__eventsystem_launch_on_event_for_userevent(evti->event_name, data, true) < 0)
+                       if (__eventsystem_launch_on_event_for_userevent(evti->event_name, data, TRUE) < 0)
                                _E("Failed to launch on event for userevent");
                } else {
                        if (__eventsystem_send_event(conn, evti, data) < 0) {
@@ -983,7 +981,7 @@ int eventsystem_send_user_event(const char *event_name, bundle *data, bool is_tr
                                goto out;
                        }
 
-                       if (__eventsystem_launch_on_event_for_userevent(evti->event_name, data, false) < 0)
+                       if (__eventsystem_launch_on_event_for_userevent(evti->event_name, data, FALSE) < 0)
                                _E("Failed to launch on event for userevent");
                }
        } else {
@@ -1498,17 +1496,17 @@ static int __eventsystem_request_earlier_data(const char *event_name,
                goto out_2;
        }
 
-       g_variant_get(value, "(iis)", &result, &len, &raw);
+       g_variant_get(value, "(ii&s)", &result, &len, &raw);
 
        _D("result(%d), len(%d)", result, len);
 
        if (!result && raw && len > 0) {
                callback(event_name, raw, len, user_data);
-               bundle_free_encoded_rawdata(&raw);
+               ret = ES_R_OK;
+       } else {
+               ret = ES_R_ERROR;
        }
 
-       ret = ES_R_OK;
-
 out_2:
        g_object_unref(proxy);
        g_variant_unref(value);
@@ -1583,7 +1581,7 @@ out_1:
 }
 
 static int __eventsystem_launch_on_event_for_userevent(const char *event_name,
-               bundle *data, const bool trusted)
+               bundle *data, gboolean trusted)
 {
        int ret = ES_R_EINVAL;
        GDBusConnection *conn = NULL;
@@ -1643,6 +1641,8 @@ out_2:
 out_1:
        if (conn)
                g_object_unref(conn);
+
+       return ret;
 }
 
 
@@ -1840,7 +1840,6 @@ int eventsystem_register_application_event(const char *event_name, unsigned int
        char *interface_name;
        char *object_path;
        char *member_name;
-       char *sender_name = NULL;
        GDBusSignalCallback filter;
        GBusType bus_type;
        guint subscription_id = 0;
@@ -1916,11 +1915,10 @@ int eventsystem_register_application_event(const char *event_name, unsigned int
                ret = ES_R_ERROR;
                goto end;
        }
-       sender_name = NULL;
 
        _D("interface_name(%s), object_path(%s)", interface_name, object_path);
-       _D(" member_name(%s), sender_name(%s), type(%d), bus_type(%d)",
-               member_name, sender_name, *event_type, bus_type);
+       _D(" member_name(%s), type(%d), bus_type(%d)",
+               member_name, *event_type, bus_type);
 
        if (__get_gdbus_shared_connection(&conn, bus_type, *event_type) < 0) {
                _E("getting gdbus-connetion error");
@@ -1940,7 +1938,7 @@ int eventsystem_register_application_event(const char *event_name, unsigned int
        }
 
        subscription_id = g_dbus_connection_signal_subscribe(conn,
-               sender_name, /* sender */
+               NULL, /* sender */
                interface_name,
                member_name, /* member */
                object_path, /* object_path */
@@ -1966,11 +1964,15 @@ int eventsystem_register_application_event(const char *event_name, unsigned int
                        if (s_info.own_name_session_bus == NULL) {
                                _E("session bus is not ready");
                                ret = ES_R_ERROR;
+                               g_dbus_connection_signal_unsubscribe(conn, subscription_id);
+                               __destroy_eventmap(em);
                        } else {
                                if (__eventsystem_setup_trusted_peer(event_name,
                                                        s_info.own_name_session_bus) < 0) {
                                        _E("failed to setup trusted peer");
                                        ret = ES_R_ERROR;
+                                       g_dbus_connection_signal_unsubscribe(conn, subscription_id);
+                                       __destroy_eventmap(em);
                                }
                        }
                }
@@ -1980,7 +1982,8 @@ int eventsystem_register_application_event(const char *event_name, unsigned int
                ret = ES_R_ERROR;
        }
 
-       __request_esd_for_last_data(event_name, true);
+       if (*event_type == ES_TYPE_USER)
+               __request_esd_for_last_data(event_name, true);
 end:
        FREE_AND_NULL(interface_name);
        FREE_AND_NULL(object_path);