From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 14 Jun 2021 15:18:19 +0000 (-0400)
Subject: Silence warnings on GCC 4.8 with -Wmaybe-uninitialized
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=da2475084f73e371756539a5da696d6ec5e187ce

Silence warnings on GCC 4.8 with -Wmaybe-uninitialized

We still build on SLES12 with GCC 4.8 in which '-Wmaybe-uninitialized'
doesn't seem to be the sharpest tool in the shed. Add explicit
initialization of 'ret' to silence the warnings.

Change-Id: I1f9de535b6be48357735af106ff555ab9eceb730
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/action-executor.c b/src/bin/lttng-sessiond/action-executor.c
index 8b8aba761..14ac8103b 100644
--- a/src/bin/lttng-sessiond/action-executor.c
+++ b/src/bin/lttng-sessiond/action-executor.c
@@ -748,7 +748,7 @@ static void *action_executor_thread(void *_data)
 	DBG("Entering work execution loop");
 	pthread_mutex_lock(&executor->work.lock);
 	while (!executor->should_quit) {
-		int ret;
+		int ret = 0;
 		struct action_work_item *work_item;
 
 		health_code_update();
@@ -983,7 +983,7 @@ error_unlock:
 static int add_action_to_subitem_array(struct lttng_action *action,
 		struct lttng_dynamic_array *subitems)
 {
-	int ret;
+	int ret = 0;
 	enum lttng_action_type type = lttng_action_get_type(action);
 	const char *session_name = NULL;
 	enum lttng_action_status status;