From: Simon Marchi <simon.marchi@efficios.com>
Date: Wed, 31 Mar 2021 19:06:34 +0000 (-0400)
Subject: Fix: sessiond: fix -Wshadow error in save.c
X-Git-Tag: v2.12.4~21
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=03e79f33de8b65a18a5929d55e937db565365fdc;p=lttng-tools.git

Fix: sessiond: fix -Wshadow error in save.c

I think this actually fixes a bug. Because of the second ret variable,
the return value from init_ust_event_from_agent_event or save_ust_event
would not be forwarded correctly, in case of error.

Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Ieb61d9b267ab90e18cc349d86754d9b89b5703f1
---

diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c
index c5ea4c873..43b0ed864 100644
--- a/src/bin/lttng-sessiond/save.c
+++ b/src/bin/lttng-sessiond/save.c
@@ -1234,7 +1234,6 @@ int save_agent_events(struct config_writer *writer,
 
 	rcu_read_lock();
 	cds_lfht_for_each_entry(agent->events->ht, &iter.iter, node, node) {
-		int ret;
 		struct agent_event *agent_event;
 		struct ltt_ust_event fake_event;