Fix: clang llvm warnings

[lttng-tools.git] / src / bin / lttng-sessiond / trace-ust.c

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index c8b3b72f91ca3343a9a507dd343d5447ea6eb323..ed635f960501b672b047ffd245436cbf46b2c533 100644 (file)
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -152,7 +152,7 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan,
        luc->attr.num_subbuf = chan->attr.num_subbuf;
        luc->attr.switch_timer_interval = chan->attr.switch_timer_interval;
        luc->attr.read_timer_interval = chan->attr.read_timer_interval;
-       luc->attr.output = chan->attr.output;
+       luc->attr.output = (enum lttng_ust_output) chan->attr.output;
 
        /* Translate to UST output enum */
        switch (luc->attr.output) {
@@ -250,6 +250,10 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
        lttng_ht_node_init_str(&lue->node, lue->attr.name);
        /* Alloc context hash tables */
        lue->ctx = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
+       if (lue->ctx == NULL) {
+               ERR("Unable to create context hash table for event %s", ev->name);
+               goto error_free_event;
+       }
 
        DBG2("Trace UST event %s, loglevel (%d,%d) created",
                lue->attr.name, lue->attr.loglevel_type,
@@ -258,7 +262,6 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
        return lue;
 
 error_free_event:
-       lttng_ht_destroy(lue->ctx);
        free(lue);
 error:
        return NULL;