X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Futils.c;h=6440ca7dfc883db2bd282aeff098e4acaa910977;hb=81663f073dbfb4b61c06a0ceb8ca33c4fc41b1c5;hp=b363cfed04521fad884a9235090e5f54f881ade3;hpb=b083f028413002a7d18f2e7b93680e1bb767a259;p=lttng-tools.git

diff --git a/src/bin/lttng/utils.c b/src/bin/lttng/utils.c
index b363cfed0..6440ca7df 100644
--- a/src/bin/lttng/utils.c
+++ b/src/bin/lttng/utils.c
@@ -6,7 +6,6 @@
  */
 
 #define _LGPL_SOURCE
-#include <assert.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <limits.h>
@@ -26,11 +25,6 @@
 #include "utils.h"
 #include "command.h"
 
-static const char *str_kernel = "Kernel";
-static const char *str_ust = "UST";
-static const char *str_jul = "JUL";
-static const char *str_log4j = "LOG4J";
-static const char *str_python = "Python";
 static const char *str_all = "ALL";
 static const char *str_tracepoint = "Tracepoint";
 static const char *str_syscall = "Syscall";
@@ -298,34 +292,6 @@ int get_count_order_ulong(unsigned long x)
 	return fls_ulong(x - 1);
 }
 
-const char *get_domain_str(enum lttng_domain_type domain)
-{
-	const char *str_dom;
-
-	switch (domain) {
-	case LTTNG_DOMAIN_KERNEL:
-		str_dom = str_kernel;
-		break;
-	case LTTNG_DOMAIN_UST:
-		str_dom = str_ust;
-		break;
-	case LTTNG_DOMAIN_JUL:
-		str_dom = str_jul;
-		break;
-	case LTTNG_DOMAIN_LOG4J:
-		str_dom = str_log4j;
-		break;
-	case LTTNG_DOMAIN_PYTHON:
-		str_dom = str_python;
-		break;
-	default:
-		/* Should not have an unknown domain or else define it. */
-		assert(0);
-	}
-
-	return str_dom;
-}
-
 const char *get_event_type_str(enum lttng_event_type type)
 {
 	const char *str_event_type;
@@ -351,7 +317,7 @@ const char *get_event_type_str(enum lttng_event_type type)
 		break;
 	default:
 		/* Should not have an unknown event type or else define it. */
-		assert(0);
+		abort();
 	}
 
 	return str_event_type;
@@ -486,8 +452,8 @@ void print_session_stats(const char *session_name)
 int get_session_stats_str(const char *session_name, char **out_str)
 {
 	int count, nb_domains, domain_idx, channel_idx, session_idx, ret;
-	struct lttng_domain *domains;
-	struct lttng_channel *channels;
+	struct lttng_domain *domains = NULL;
+	struct lttng_channel *channels = NULL;
 	uint64_t discarded_events_total = 0, lost_packets_total = 0;
 	struct lttng_session *sessions = NULL;
 	const struct lttng_session *selected_session = NULL;
@@ -529,6 +495,8 @@ int get_session_stats_str(const char *session_name, char **out_str)
 			goto end;
 		}
 
+		free(channels);
+		channels = NULL;
 		count = lttng_list_channels(handle, &channels);
 		for (channel_idx = 0; channel_idx < count; channel_idx++) {
 			uint64_t discarded_events = 0, lost_packets = 0;
@@ -590,6 +558,8 @@ int get_session_stats_str(const char *session_name, char **out_str)
 	}
 end:
 	free(sessions);
+	free(channels);
+	free(domains);
 	return ret;
 }
 
@@ -599,7 +569,7 @@ int show_cmd_help(const char *cmd_name, const char *help_msg)
 	char page_name[32];
 
 	ret = sprintf(page_name, "lttng-%s", cmd_name);
-	assert(ret > 0 && ret < 32);
+	LTTNG_ASSERT(ret > 0 && ret < 32);
 	ret = utils_show_help(1, page_name, help_msg);
 	if (ret && !help_msg) {
 		ERR("Cannot view man page `lttng-%s(1)`", cmd_name);