Fix: lttng-list: don't warn when the kernel domain has no channels

[lttng-tools.git] / src / bin / lttng / commands / list.c

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index 898c0de6a02e1a2735d9ce5f59067fe10fe788fb..b4a9c29f0da79165aaf8046eab90790cd45a5332 100644 (file)
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -1369,7 +1369,6 @@ static int list_channels(const char *channel_name)
                                count = 0;
                        } else {
                                ret = CMD_SUCCESS;
-                               WARN("No kernel channel");
                                goto error_channels;
                        }
                        break;
@@ -1601,7 +1600,7 @@ static int list_sessions(const char *session_name)
        int ret = CMD_SUCCESS;
        int count, i;
        unsigned int session_found = 0;
-       struct lttng_session *sessions;
+       struct lttng_session *sessions = NULL;
 
        count = lttng_list_sessions(&sessions);
        DBG("Session count %d", count);
@@ -1614,7 +1613,7 @@ static int list_sessions(const char *session_name)
        if (lttng_opt_mi) {
                /* Mi */
                if (session_name == NULL) {
-                       /* List all session */
+                       /* List all sessions */
                        ret = mi_list_sessions(sessions, count);
                } else {
                        /* Note : this return an open session element */
@@ -1622,7 +1621,7 @@ static int list_sessions(const char *session_name)
                }
                if (ret) {
                        ret = CMD_ERROR;
-                       goto error;
+                       goto end;
                }
        } else {
                /* Pretty print */
@@ -1665,7 +1664,7 @@ static int list_sessions(const char *session_name)
                if (!session_found && session_name != NULL) {
                        ERR("Session '%s' not found", session_name);
                        ret = CMD_ERROR;
-                       goto error;
+                       goto end;
                }
 
                if (session_name == NULL) {
@@ -1673,9 +1672,8 @@ static int list_sessions(const char *session_name)
                }
        }
 
-error:
-       free(sessions);
 end:
+       free(sessions);
        return ret;
 }