Fix wrong return value on consumer socket creation

[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 f7a5c576bc58b63e0bf4e8037551075a3161c78e..f1707fc76844d76d68d43c85e5da0df645c627ec 100644 (file)
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -144,26 +144,6 @@ const char *enabled_string(int value)
        }
 }
 
-static
-const char *loglevel_string_pre(int loglevel)
-{
-       if (loglevel == -1) {
-               return "";
-       } else {
-               return " (loglevel: ";
-       }
-}
-
-static
-const char *loglevel_string_post(int loglevel)
-{
-       if (loglevel == -1) {
-               return "";
-       } else {
-               return ")";
-       }
-}
-
 static const char *loglevel_string(int value)
 {
        switch (value) {
@@ -212,12 +192,19 @@ static void print_events(struct lttng_event *event)
        switch (event->type) {
        case LTTNG_EVENT_TRACEPOINT:
        {
-               MSG("%s%s%s%s%s (type: tracepoint)%s", indent6,
+               if (event->loglevel != -1) {
+                       MSG("%s%s (loglevel: %s (%d)) (type: tracepoint)%s",
+                               indent6,
                                event->name,
-                               loglevel_string_pre(event->loglevel),
                                loglevel_string(event->loglevel),
-                               loglevel_string_post(event->loglevel),
+                               event->loglevel,
+                               enabled_string(event->enabled));
+               } else {
+                       MSG("%s%s (type: tracepoint)%s",
+                               indent6,
+                               event->name,
                                enabled_string(event->enabled));
+               }
                break;
        }
        case LTTNG_EVENT_PROBE:
@@ -488,6 +475,9 @@ static int list_sessions(const char *session_name)
        if (count < 0) {
                ret = count;
                goto error;
+       } else if (count == 0) {
+               MSG("Currently no available tracing session");
+               goto end;
        }
 
        if (session_name == NULL) {
@@ -525,6 +515,7 @@ static int list_sessions(const char *session_name)
                MSG("\nUse lttng list <session_name> for more details");
        }
 
+end:
        return CMD_SUCCESS;
 
 error: