pass: Remove unreachable code of dbus_cb_core_stop()

The pass_exit_done() always returns zero. It means that pass_exit_done()
doesn't need to return any value and it makes the unreachable code of
dbus_cb_core_stop(). Replace return type from int to void of pass_exit_done()
to remove unreachable code of dbus_cb_core_stop().

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

diff --git a/src/pass/pass.c b/src/pass/pass.c
index 9ea9e67..7cb95f6 100644 (file)
--- a/src/pass/pass.c
+++ b/src/pass/pass.c
@@ -57,7 +57,7 @@ static int pass_probe(void *data);
 static void pass_init(void *data);
 static int pass_init_done(void *data, void *user_data);
 static void pass_exit(void *data);
-static int pass_exit_done(void);
+static void pass_exit_done(void);
 
 /******************************************************
  *                PASS D-Bus interface                *
@@ -85,21 +85,14 @@ static gboolean dbus_cb_core_start(SystemPassCore *obj,
 static gboolean dbus_cb_core_stop(SystemPassCore *obj,
                GDBusMethodInvocation *invoc, gpointer user_data)
 {
-       int ret = 0;
-
        if (g_pass.state == PASS_OFF)
                _I("PASS Core is already stopped\n");
        else
-               ret = pass_exit_done();
+               pass_exit_done();
 
-       g_dbus_method_invocation_return_value(invoc, g_variant_new("(i)", ret));
+       g_dbus_method_invocation_return_value(invoc, g_variant_new("(i)", 0));
 
-       if (!ret)
-               return TRUE;
-
-       _E("failed to exit PASS Core of the daemon in dbus callback "
-                       "for a stop message\n");
-       return FALSE;
+       return TRUE;
 }
 
 static struct pass_gdbus_signal_info g_gdbus_signal_infos[] = {
@@ -270,7 +263,7 @@ static int pass_init_done(void *data, void *user_data)
        return 0;
 }
 
-static int pass_exit_done(void)
+static void pass_exit_done(void)
 {
        int i, ret = 0;
 
@@ -299,8 +292,6 @@ static int pass_exit_done(void)
        /* Put configuration of resource list from pass.conf */
        pass_put_resource_config(&g_pass);
        g_pass.state = PASS_OFF;
-
-       return 0;
 }
 
 /*
@@ -322,8 +313,6 @@ static void pass_init(void *data)
  */
 static void pass_exit(void *data)
 {
-       int ret;
-
        unregister_notifier(DEVICE_NOTIFIER_BOOTING_DONE,
                        pass_init_done, NULL);
 
@@ -331,11 +320,7 @@ static void pass_exit(void *data)
                        DBUS_CORE_I_NUM_SIGNALS, g_gdbus_signal_infos);
        pass_gdbus_put_instance_core(&g_gdbus_instance);
 
-       ret = pass_exit_done();
-       if (ret < 0) {
-               _E("cannot exit PASS daemon\n");
-               return;
-       }
+       pass_exit_done();
 
        _I("Exit PASS daemon without any errors\n");
 }