Fix: Warnings introduced by backported fixes

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index c2db9ef65ce6fba4d5694d16bb4fcfc9085be65d..84ee1a6e5e228330f9ef7b9656f8d9c64a1d0ff7 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -3067,7 +3067,7 @@ int cmd_snapshot_record(struct ltt_session *session,
        int ret = LTTNG_OK;
        unsigned int use_tmp_output = 0;
        struct snapshot_output tmp_output;
-       unsigned int nb_streams, snapshot_success = 0;
+       unsigned int snapshot_success = 0;
 
        assert(session);
 

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 0ffcb3b6ab7e60a6fb44780413183803d923a462..fa8dc5fefdd1850a750aebdd0280e6780a7117fd 100644 (file)
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -591,7 +591,6 @@ static int push_metadata(struct ust_registry_session *registry,
        return 0;
 
 error:
-end:
        return ret_val;
 }
 
@@ -4158,7 +4157,6 @@ int ust_app_flush_session(struct ltt_ust_session *usess)
                break;
        }
 
-end_no_session:
        rcu_read_unlock();
        health_code_update();
        return ret;

diff --git a/src/common/consumer.c b/src/common/consumer.c
index e01e2fdfe44ca1170dcd8a1e5df9fce678006acc..3bb2e25d08333348f42c0c97060dc59496d32a5e 100644 (file)
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -2331,7 +2331,6 @@ restart:
 
        /* All is OK */
        err = 0;
-error:
 end:
        DBG("Metadata poll thread exiting");