Force usage of assert() condition when NDEBUG is defined

[lttng-tools.git] / src / bin / lttng / utils.c

diff --git a/src/bin/lttng/utils.c b/src/bin/lttng/utils.c
index e836943991da04d16c9c0764230cd4e3ca6367e6..6440ca7dfc883db2bd282aeff098e4acaa910977 100644 (file)
--- 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>
@@ -318,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;
@@ -453,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;
@@ -496,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;
@@ -557,6 +558,8 @@ int get_session_stats_str(const char *session_name, char **out_str)
        }
 end:
        free(sessions);
+       free(channels);
+       free(domains);
        return ret;
 }
 
@@ -566,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);