From 470adfec9cff5f541618dd0691fc86c8482bc725 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Wed, 21 Jan 2015 23:14:52 -0500 Subject: [PATCH] Fix: Warnings introduced by backported fixes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- src/bin/lttng-sessiond/cmd.c | 2 +- src/bin/lttng-sessiond/ust-app.c | 2 -- src/common/consumer.c | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) 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"); -- 2.34.1