Merge branch 'master' of git://git.lttng.org/lttng-tools

[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 250e4d8f6a0f60f73e201dba514fbd640628c33c..c0bd30f2245a1a3597e9e9699d500d925ea0a249 100644 (file)
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -176,13 +176,13 @@ static const char *loglevel_string(int value)
        case 5: return "TRACE_NOTICE";
        case 6: return "TRACE_INFO";
        case 7: return "TRACE_SYSTEM";
-       case 8: return "TRACE_PROCESS";
-       case 9: return "TRACE_MODULE";
-       case 10: return "TRACE_UNIT";
-       case 11: return "TRACE_CLASS";
-       case 12: return "TRACE_OBJECT";
-       case 13: return "TRACE_FUNCTION";
-       case 14: return "TRACE_PRINTF";
+       case 8: return "TRACE_PROGRAM";
+       case 9: return "TRACE_PROCESS";
+       case 10: return "TRACE_MODULE";
+       case 11: return "TRACE_UNIT";
+       case 12: return "TRACE_FUNCTION";
+       case 13: return "TRACE_DEFAULT";
+       case 14: return "TRACE_VERBOSE";
        case 15: return "TRACE_DEBUG";
        default: return "<<UNKNOWN>>";
        }
@@ -480,7 +480,8 @@ static int list_sessions(const char *session_name)
                        continue;
                }
 
-               MSG("  %d) %s (%s)%s", i + 1, sessions[i].name, sessions[i].path, active_string(sessions[i].enabled));
+               MSG("  %d) %s (%s)%s", i + 1, sessions[i].name, sessions[i].path,
+                               active_string(sessions[i].enabled));
 
                if (session_found) {
                        break;
@@ -490,7 +491,9 @@ static int list_sessions(const char *session_name)
        free(sessions);
 
        if (!session_found && session_name != NULL) {
-               ERR("Session %s not found", session_name);
+               ERR("Session '%s' not found", session_name);
+               ret = CMD_ERROR;
+               goto error;
        }
 
        if (session_name == NULL) {
@@ -601,7 +604,7 @@ int cmd_list(int argc, const char **argv)
        if (session_name == NULL) {
                if (!opt_kernel && !opt_userspace) {
                        ret = list_sessions(NULL);
-                       if (ret < 0) {
+                       if (ret != 0) {
                                goto end;
                        }
                }
@@ -620,7 +623,7 @@ int cmd_list(int argc, const char **argv)
        } else {
                /* List session attributes */
                ret = list_sessions(session_name);
-               if (ret < 0) {
+               if (ret != 0) {
                        goto end;
                }