X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Flttng-live%2Fmetadata.cpp;h=4cc750b802b0ca3fa803fd81643ff9a09d9e8c11;hb=afb0f12beee7f3aa65156e27a76b627dfb3b52e1;hp=46a1151185f4fbff9437b55d49c0daf130a2ae77;hpb=a745c1904cb9637f78e0f6d8a1927b2dd05db436;p=babeltrace.git diff --git a/src/plugins/ctf/lttng-live/metadata.cpp b/src/plugins/ctf/lttng-live/metadata.cpp index 46a11511..4cc750b8 100644 --- a/src/plugins/ctf/lttng-live/metadata.cpp +++ b/src/plugins/ctf/lttng-live/metadata.cpp @@ -294,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; @@ -327,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; } @@ -340,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; }