X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=580b13f1f88d9943162078e0655a2bb47448599b;hp=2dd0dc8a331d0a34e09764ce1b3217c9d6e1bcf7;hb=1b2ef7fe9e5d6396484002b5ba20b798b45519f9;hpb=fb14d0d8da366c09452d1f8c43268e46dfb7da40

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index 2dd0dc8a3..580b13f1f 100644
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -184,34 +184,6 @@ const char *exclusion_string(int value)
 	}
 }
 
-static const char *loglevel_jul_string(int value)
-{
-	switch (value) {
-	case -1:
-		return "";
-	case LTTNG_LOGLEVEL_JUL_OFF:
-		return "JUL_OFF";
-	case LTTNG_LOGLEVEL_JUL_SEVERE:
-		return "JUL_SEVERE";
-	case LTTNG_LOGLEVEL_JUL_WARNING:
-		return "JUL_WARNING";
-	case LTTNG_LOGLEVEL_JUL_INFO:
-		return "JUL_INFO";
-	case LTTNG_LOGLEVEL_JUL_CONFIG:
-		return "JUL_CONFIG";
-	case LTTNG_LOGLEVEL_JUL_FINE:
-		return "JUL_FINE";
-	case LTTNG_LOGLEVEL_JUL_FINER:
-		return "JUL_FINER";
-	case LTTNG_LOGLEVEL_JUL_FINEST:
-		return "JUL_FINEST";
-	case LTTNG_LOGLEVEL_JUL_ALL:
-		return "JUL_ALL";
-	default:
-		return "<<UNKNOWN>>";
-	}
-}
-
 static const char *logleveltype_string(enum lttng_loglevel_type value)
 {
 	switch (value) {
@@ -584,10 +556,8 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
 		if (cur_pid != fields[i].event.pid) {
 			if (pid_element_open) {
 				if (event_element_open) {
-					/* 
-					 * Close the previous fields element
-					 * and the previous event
-					 */
+
+					/* Close the previous field element and event. */
 					ret = mi_lttng_close_multi_element(writer, 2);
 					if (ret) {
 						goto end;
@@ -776,7 +746,7 @@ static int mi_list_kernel_events(struct lttng_event *events, int count,
 	}
 
 	for (i = 0; i < count; i++) {
-		mi_lttng_event(writer, &events[i], 0);
+		ret = mi_lttng_event(writer, &events[i], 0);
 		if (ret) {
 			goto end;
 		}
@@ -913,7 +883,7 @@ static int list_session_jul_events(void)
 			MSG("%s- %s%s (loglevel%s %s)", indent4, events[i].name,
 					enabled_string(events[i].enabled),
 					logleveltype_string(events[i].loglevel_type),
-					loglevel_jul_string(events[i].loglevel));
+					mi_lttng_loglevel_string(events[i].loglevel));
 		}
 
 		MSG("");