X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=3bac86ecdcd93220653c4119111dc542527d4a49;hb=baa81d3ac6e60bf3caf261342e10a7f85e87e23a;hp=da287f5caf9c4a7658b30f4419cf1be7aebb66bb;hpb=6d1fcf1c029c10dd79c3be0686b1fae567604406;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index da287f5ca..3bac86ecd 100644
--- 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>>";
 	}
@@ -608,14 +608,12 @@ int cmd_list(int argc, const char **argv)
 		if (opt_kernel) {
 			ret = list_kernel_events();
 			if (ret < 0) {
-				ret = CMD_ERROR;
 				goto end;
 			}
 		}
 		if (opt_userspace) {
 			ret = list_ust_events();
 			if (ret < 0) {
-				ret = CMD_ERROR;
 				goto end;
 			}
 		}
@@ -629,9 +627,6 @@ int cmd_list(int argc, const char **argv)
 		/* Domain listing */
 		if (opt_domain) {
 			ret = list_domains(session_name);
-			if (ret < 0) {
-				ret = CMD_ERROR;
-			}
 			goto end;
 		}
 
@@ -639,14 +634,13 @@ int cmd_list(int argc, const char **argv)
 			/* Channel listing */
 			ret = list_channels(opt_channel);
 			if (ret < 0) {
-				ret = CMD_ERROR;
 				goto end;
 			}
 		} else {
 			/* We want all domain(s) */
 			nb_domain = lttng_list_domains(session_name, &domains);
 			if (nb_domain < 0) {
-				ret = CMD_ERROR;
+				ret = nb_domain;
 				goto end;
 			}
 
@@ -674,7 +668,6 @@ int cmd_list(int argc, const char **argv)
 
 				ret = list_channels(opt_channel);
 				if (ret < 0) {
-					ret = CMD_ERROR;
 					goto end;
 				}
 			}