From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Tue, 1 Mar 2022 15:23:24 +0000 (-0500)
Subject: Fix: session: end goto label used for error path
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=e68d8bdb16c60aca0acdf4c4887d138031199af3;p=lttng-tools.git

Fix: session: end goto label used for error path

Reported by Coverity:

    CID 1475801: Unused value (UNUSED_VALUE)
    Assigning value LTTNG_ERR_FATAL to ret_code here, but that stored value is overwritten before it can be used

    CID 1475802: Unused value (UNUSED_VALUE)
    Assigning value LTTNG_ERR_NOMEM to ret_code here, but that stored value is overwritten before it can be used.

    CID 1475814: Unused value (UNUSED_VALUE)
    Assigning value LTTNG_ERR_UST_CHAN_NOT_FOUND to ret_code here, but that stored value is overwritten before it can be used.

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I79fb5d65ea0f4f3dfbbef2a42ec3dcf0542043c5
---

diff --git a/src/bin/lttng-sessiond/cmd.cpp b/src/bin/lttng-sessiond/cmd.cpp
index ad3bbb387..659e389b2 100644
--- a/src/bin/lttng-sessiond/cmd.cpp
+++ b/src/bin/lttng-sessiond/cmd.cpp
@@ -387,7 +387,7 @@ static enum lttng_error_code list_lttng_ust_global_events(char *channel_name,
 	node = lttng_ht_iter_get_node_str(&iter);
 	if (node == NULL) {
 		ret_code = LTTNG_ERR_UST_CHAN_NOT_FOUND;
-		goto end;
+		goto error;
 	}
 
 	uchan = caa_container_of(&node->node, struct ltt_ust_channel, node.node);
@@ -420,14 +420,14 @@ static enum lttng_error_code list_lttng_ust_global_events(char *channel_name,
 		tmp_event = lttng_event_create();
 		if (!tmp_event) {
 			ret_code = LTTNG_ERR_NOMEM;
-			goto end;
+			goto error;
 		}
 
 		if (lttng_strncpy(tmp_event->name, uevent->attr.name,
 				LTTNG_SYMBOL_NAME_LEN)) {
 			ret_code = LTTNG_ERR_FATAL;
 			lttng_event_destroy(tmp_event);
-			goto end;
+			goto error;
 		}
 
 		tmp_event->name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';