Fix svace issues

UNREACHABLE_CODE.RET

Change-Id: I3aea889f4ed87325da8816fc620d0ca2ead1ec93

diff --git a/packaging/asp-manager.spec b/packaging/asp-manager.spec
index 42703c187aad644fb23d44e694a298715c55441e..382319609252504402ecdc27ff3077fc5b72c743 100755 (executable)
--- a/packaging/asp-manager.spec
+++ b/packaging/asp-manager.spec
@@ -1,6 +1,6 @@
 Name:       asp-manager
 Summary:    ASP(application service platform) manager
-Version:    0.0.34
+Version:    0.0.35
 Release:    1
 Group:      Network & Connectivity/Other
 License:    Apache-2.0

diff --git a/src/asp-manager-gdbus.c b/src/asp-manager-gdbus.c
index f177a2f3b388e05884ad3d3c4436b1b23cb88100..05ba4050852907ed56df250ccaa2d7ab09a49767 100755 (executable)
--- a/src/asp-manager-gdbus.c
+++ b/src/asp-manager-gdbus.c
@@ -489,7 +489,6 @@ static gboolean __asp_manager_gdbus_connect_session(AspSession *object,
        guint32 session_id = 0;
        const gchar *service_mac_str = NULL;
        gchar peer_ip_str[IPSTR_MAXLEN] = {0,};
-       gboolean res;
 
        asp = (asp_s *)user_data;
        if (!asp) {
@@ -568,14 +567,9 @@ static gboolean __asp_manager_gdbus_connect_session(AspSession *object,
 
        macaddr_atoe(service_mac_str, service_mac);
        ASP_LOGD("service mac" MACSTR, MAC2STR(service_mac));
-       res = asp_session_connect_session_over_p2p(service_mac, adv_id,
+       asp_session_connect_session_over_p2p(service_mac, adv_id,
                        session_info, info_length, network_role, network_config,
                        asp->p2p_local_address, &session_id);
-       if (!res) {
-               ASP_LOGE("Operation Failed");
-               ASP_RETURN_SESSION_ERR(invocation, -ASP_ERROR_OPERATION_FAILED);
-               goto out;
-       }
 
        asp_session_complete_connect_session(object, invocation, ASP_ERROR_NONE,
                        session_id, asp->p2p_local_address_str);
@@ -606,7 +600,6 @@ static gboolean __asp_manager_gdbus_confirm_session(AspSession *object,
        guint32 session_id = 0;
        guint32 pin = 0;
        guint8 mac_addr[MAC_LEN] = {0,};
-       gboolean res;
 
        asp = (asp_s *)user_data;
        if (!asp) {
@@ -653,13 +646,7 @@ static gboolean __asp_manager_gdbus_confirm_session(AspSession *object,
        macaddr_atoe(session_mac, mac_addr);
        if (pin_str != NULL)
                pin = (guint32)atoi(pin_str);
-       res = asp_session_confirm_session(mac_addr, session_id, confirmed, pin);
-       if (!res) {
-               ASP_LOGE("Operation Failed");
-               ASP_RETURN_SESSION_ERR(invocation, -ASP_ERROR_OPERATION_FAILED);
-               goto out;
-       }
-
+       asp_session_confirm_session(mac_addr, session_id, confirmed, pin);
        asp_session_complete_confirm_session(object, invocation, ASP_ERROR_NONE);
 
 out:
@@ -703,12 +690,7 @@ static gboolean __asp_manager_gdbus_get_session(AspSession *object,
        ASP_LOGD("session ID [%u] session mac [%s]", session_id, session_mac);
 
        macaddr_atoe(session_mac, mac_addr);
-       if (!asp_session_get_advertisement_id(mac_addr, session_id, &adv_id)) {
-               ASP_LOGE("Failed to get session");
-               ASP_RETURN_SESSION_ERR(invocation, -ASP_ERROR_SESSION_NOT_FOUND);
-               goto out;
-       }
-
+       asp_session_get_advertisement_id(mac_addr, session_id, &adv_id);
        ASP_LOGD("adv id [%u]", adv_id);
        builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
        g_variant_builder_add(builder, "{sv}", "adv_id", g_variant_new("u", adv_id));
@@ -731,7 +713,6 @@ static gboolean __asp_manager_gdbus_set_session_ready(AspSession *object,
        __ASP_LOG_FUNC_ENTER__;
        asp_s *asp = NULL;
        guint8 mac_addr[MAC_LEN] = {0,};
-       gboolean res;
 
        asp = (asp_s *)user_data;
        if (!asp) {
@@ -754,13 +735,7 @@ static gboolean __asp_manager_gdbus_set_session_ready(AspSession *object,
        ASP_LOGD("session ID [%u] session mac [%s]", session_id, session_mac);
 
        macaddr_atoe(session_mac, mac_addr);
-       res = asp_session_set_session_ready(mac_addr, session_id);
-       if (!res) {
-               ASP_LOGE("Operation Failed");
-               ASP_RETURN_SESSION_ERR(invocation, -ASP_ERROR_OPERATION_FAILED);
-               goto out;
-       }
-
+       asp_session_set_session_ready(mac_addr, session_id);
        asp_session_complete_set_session_ready(object, invocation, ASP_ERROR_NONE);
 
 out:
@@ -777,7 +752,6 @@ static gboolean __asp_manager_gdbus_close_session(AspSession *object,
        __ASP_LOG_FUNC_ENTER__;
        asp_s *asp = NULL;
        guint8 mac_addr[MAC_LEN] = {0,};
-       gboolean res;
 
        asp = (asp_s *)user_data;
        if (!asp) {
@@ -800,13 +774,7 @@ static gboolean __asp_manager_gdbus_close_session(AspSession *object,
        ASP_LOGD("session ID [%u] session mac [%s]", session_id, session_mac);
 
        macaddr_atoe(session_mac, mac_addr);
-       res = asp_session_close_session(mac_addr, session_id, 0);
-       if (!res) {
-               ASP_LOGE("Operation Failed");
-               ASP_RETURN_SESSION_ERR(invocation, -ASP_ERROR_OPERATION_FAILED);
-               goto out;
-       }
-
+       asp_session_close_session(mac_addr, session_id, 0);
        asp_session_complete_close_session(object, invocation, ASP_ERROR_NONE);
 
 out:
@@ -831,7 +799,6 @@ static gboolean __asp_manager_gdbus_bound_port(AspSession *object,
        gint32 port = 0;
        gint32 proto = 0;
        guint8 mac_addr[MAC_LEN] = {0,};
-       gboolean res;
 
        asp = (asp_s *)user_data;
        if (!asp) {
@@ -879,14 +846,7 @@ static gboolean __asp_manager_gdbus_bound_port(AspSession *object,
        ASP_LOGD("session ID [%u] session mac [%s]", session_id, session_mac);
 
        macaddr_atoe(session_mac, mac_addr);
-       res = asp_session_bound_port(mac_addr, session_id, ip_address,
-                       port, proto);
-       if (!res) {
-               ASP_LOGE("Operation Failed");
-               ASP_RETURN_SESSION_ERR(invocation, -ASP_ERROR_OPERATION_FAILED);
-               goto out;
-       }
-
+       asp_session_bound_port(mac_addr, session_id, ip_address, port, proto);
        asp_session_complete_bound_port(object, invocation, ASP_ERROR_NONE);
 
 out:
@@ -1063,14 +1023,8 @@ static void __asp_manager_gdbus_on_bus_acquired(GDBusConnection *connection,
 
        asp->connection = connection;
 
-       if (__asp_manager_gdbus_service_init(asp) == FALSE) {
-               ASP_LOGE("Can not signal connect to service");
-               /* Deinitialize and quit manager */
-       }
-       if (__asp_manager_gdbus_session_init(asp) == FALSE) {
-               ASP_LOGE("Can not signal connect to session");
-               /* Deinitialize and quit manager */
-       }
+       __asp_manager_gdbus_service_init(asp);
+       __asp_manager_gdbus_session_init(asp);
 
        g_dbus_object_manager_server_set_connection(asp->obj_mgr, asp->connection);
        __ASP_LOG_FUNC_EXIT__;

diff --git a/src/asp-manager.c b/src/asp-manager.c
index 04d08a794c7ec0f543da9b6e2c9134c3fa23fa40..1e45e70139670eafaf2b252125be64317e3f4f14 100755 (executable)
--- a/src/asp-manager.c
+++ b/src/asp-manager.c
@@ -156,8 +156,6 @@ asp_s *asp_get_manager()
 static void __asp_manager_deinit()
 {
        __ASP_LOG_FUNC_ENTER__;
-       gint32 res = 0;
-
        if (!g_asp) {
                ASP_LOGD("Memory for manager structure is not allocated");
                return;
@@ -167,11 +165,7 @@ static void __asp_manager_deinit()
                ASP_LOGE("Failed to deinitialize session");
 
        asp_tech_deinit();
-
-       res = asp_service_deinit();
-       if (res < 0)
-               ASP_LOGE("Failed to deinitialize service");
-
+       asp_service_deinit();
        asp_manager_gdbus_deinit((gpointer)g_asp);
 
        g_free(g_asp);
@@ -183,7 +177,6 @@ static asp_s *__asp_manager_init()
 {
        __ASP_LOG_FUNC_ENTER__;
        asp_s *asp = NULL;
-       gint32 res = 0;
 
        asp = (asp_s*) g_try_malloc0(sizeof(asp_s));
        if (!asp) {
@@ -196,18 +189,8 @@ static asp_s *__asp_manager_init()
        asp_tech_init();
        /* TODO : Handle tech failure */
 
-       res = asp_service_init();
-       if (res < 0) {
-               ASP_LOGE("Failed to initialize service");
-               g_free(asp);
-               return NULL;
-       }
-
-       if (!asp_session_initialize()) {
-               ASP_LOGE("Failed to initialize session");
-               g_free(asp);
-               return NULL;
-       }
+       asp_service_init();
+       asp_session_initialize();
 
        asp_session_set_session_request_cb(__session_request_cb, NULL);
        asp_session_set_session_config_request_cb(__session_config_request_cb, NULL);