ctf: allocate some structures with new

[babeltrace.git] / src / plugins / ctf / lttng-live / metadata.cpp

diff --git a/src/plugins/ctf/lttng-live/metadata.cpp b/src/plugins/ctf/lttng-live/metadata.cpp
index b8fbf727caba831ae6a713e63587a505ab0b64d5..4cc750b802b0ca3fa803fd81643ff9a09d9e8c11 100644 (file)
--- a/src/plugins/ctf/lttng-live/metadata.cpp
+++ b/src/plugins/ctf/lttng-live/metadata.cpp
@@ -20,8 +20,9 @@
 
 #include "compat/memstream.h"
 
-#include "../common/metadata/ctf-meta-configure-ir-trace.hpp"
-#include "../common/metadata/decoder.hpp"
+#include "../common/src/metadata/tsdl/ctf-meta-configure-ir-trace.hpp"
+#include "../common/src/metadata/tsdl/decoder.hpp"
+#include "lttng-live.hpp"
 #include "metadata.hpp"
 
 #define TSDL_MAGIC 0x75d11d57
@@ -212,7 +213,7 @@ enum lttng_live_iterator_status lttng_live_metadata_update(struct lttng_live_tra
             goto end;
         }
 
-        /* The relay sent zero bytes of metdata. */
+        /* The relay sent zero bytes of metadata. */
         trace->metadata_stream_state = LTTNG_LIVE_METADATA_STREAM_STATE_NOT_NEEDED;
         goto end;
     }
@@ -263,7 +264,7 @@ enum lttng_live_iterator_status lttng_live_metadata_update(struct lttng_live_tra
             trace->clock_class = borrow_any_clock_class(trace->trace_class);
         }
 
-        /* The metadata was updated succesfully. */
+        /* The metadata was updated successfully. */
         trace->metadata_stream_state = LTTNG_LIVE_METADATA_STREAM_STATE_NOT_NEEDED;
 
         break;
@@ -293,20 +294,16 @@ int lttng_live_metadata_create_stream(struct lttng_live_session *session, uint64
 {
     bt_self_component *self_comp = session->self_comp;
     bt_logging_level log_level = session->log_level;
-    struct lttng_live_metadata *metadata = NULL;
     struct lttng_live_trace *trace;
 
-    ctf_metadata_decoder_config cfg {};
+    ctf_metadata_decoder_config cfg;
     cfg.log_level = session->log_level;
     cfg.self_comp = session->self_comp;
     cfg.clock_class_offset_s = 0;
     cfg.clock_class_offset_ns = 0;
     cfg.create_trace_class = true;
 
-    metadata = g_new0(struct lttng_live_metadata, 1);
-    if (!metadata) {
-        return -1;
-    }
+    lttng_live_metadata *metadata = new lttng_live_metadata;
     metadata->log_level = session->log_level;
     metadata->self_comp = session->self_comp;
     metadata->stream_id = stream_id;
@@ -326,7 +323,7 @@ int lttng_live_metadata_create_stream(struct lttng_live_session *session, uint64
 
 error:
     ctf_metadata_decoder_destroy(metadata->decoder);
-    g_free(metadata);
+    delete metadata;
     return -1;
 }
 
@@ -339,5 +336,5 @@ void lttng_live_metadata_fini(struct lttng_live_trace *trace)
     }
     ctf_metadata_decoder_destroy(metadata->decoder);
     trace->metadata = NULL;
-    g_free(metadata);
+    delete metadata;
 }