From 0de5bc2651b05aa4fa8d48c75d6c67ee35b8747c 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/kernel.c | 1 - src/bin/lttng-sessiond/ust-app.c | 3 --- src/common/consumer.c | 1 - 3 files changed, 5 deletions(-) diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c index bac01a035..830d23100 100644 --- a/src/bin/lttng-sessiond/kernel.c +++ b/src/bin/lttng-sessiond/kernel.c @@ -838,7 +838,6 @@ int kernel_snapshot_record(struct ltt_kernel_session *ksess, struct consumer_socket *socket; struct lttng_ht_iter iter; struct ltt_kernel_metadata *saved_metadata; - uint64_t max_size_per_stream = 0; assert(ksess); assert(ksess->consumer); diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c index c9a5f5261..eab8f90d1 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; } @@ -4092,7 +4091,6 @@ int ust_app_flush_session(struct ltt_ust_session *usess) break; } -end_no_session: rcu_read_unlock(); health_code_update(); return ret; @@ -4988,7 +4986,6 @@ int ust_app_snapshot_record(struct ltt_ust_session *usess, struct lttng_ht_iter iter; struct ust_app *app; char pathname[PATH_MAX]; - uint64_t max_stream_size = 0; assert(usess); assert(output); diff --git a/src/common/consumer.c b/src/common/consumer.c index 25db6604a..a5bdd1e7a 100644 --- a/src/common/consumer.c +++ b/src/common/consumer.c @@ -2330,7 +2330,6 @@ restart: /* All is OK */ err = 0; -error: end: DBG("Metadata poll thread exiting"); -- 2.34.1