From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Thu, 22 Jan 2015 04:14:52 +0000 (-0500)
Subject: Fix: Warnings introduced by backported fixes
X-Git-Tag: v2.5.4~8
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=470adfec9cff5f541618dd0691fc86c8482bc725;p=lttng-tools.git

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 c2db9ef65..84ee1a6e5 100644
--- 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 0ffcb3b6a..fa8dc5fef 100644
--- 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 e01e2fdfe..3bb2e25d0 100644
--- 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");