X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=022d5cee14aef361780e400c37ef31877728550e;hb=22aca9f6954179e10aeed2e1a5719a2f13600eae;hp=8f8278eecd0d4515eda282495918c0c279e813f2;hpb=967375aadf345ac9c655f2558638713178ed1a3c;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 8f8278eec..022d5cee1 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -2388,12 +2388,12 @@ ssize_t cmd_list_channels(int domain, struct ltt_session *session,
 					session->ust_session->domain_global.channels);
 		}
 		DBG3("Number of UST global channels %zd", nb_chan);
-		if (nb_chan <= 0) {
+		if (nb_chan < 0) {
 			ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
+			goto error;
 		}
 		break;
 	default:
-		*channels = NULL;
 		ret = LTTNG_ERR_UND;
 		goto error;
 	}
@@ -2406,10 +2406,6 @@ ssize_t cmd_list_channels(int domain, struct ltt_session *session,
 		}
 
 		list_lttng_channels(domain, session, *channels);
-	} else {
-		*channels = NULL;
-		/* Ret value was set in the domain switch case */
-		goto error;
 	}
 
 	return nb_chan;