X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Flttng-live%2Fmetadata.c;h=4cfd88301572e7de05cc1f8b7177443040e642f1;hb=40f4ba76dd6f9508ca51b6220eaed57632281a07;hp=0aae051c5b22166dd6256e34dc5e3216445f5870;hpb=f6ccaed94e575af57fe6bf38154771bee4871a2a;p=babeltrace.git

diff --git a/plugins/ctf/lttng-live/metadata.c b/plugins/ctf/lttng-live/metadata.c
index 0aae051c..4cfd8830 100644
--- a/plugins/ctf/lttng-live/metadata.c
+++ b/plugins/ctf/lttng-live/metadata.c
@@ -62,7 +62,7 @@ enum bt_lttng_live_iterator_status lttng_live_update_clock_map(
 	size_t i;
 	int count, ret;
 
-	BT_PUT(trace->cc_prio_map);
+	BT_OBJECT_PUT_REF_AND_RESET(trace->cc_prio_map);
 	trace->cc_prio_map = bt_clock_class_priority_map_create();
 	if (!trace->cc_prio_map) {
 		goto error;
@@ -72,13 +72,13 @@ enum bt_lttng_live_iterator_status lttng_live_update_clock_map(
 	BT_ASSERT(count >= 0);
 
 	for (i = 0; i < count; i++) {
-		struct bt_clock_class *clock_class =
+		const struct bt_clock_class *clock_class =
 			bt_trace_get_clock_class_by_index(trace->trace, i);
 
 		BT_ASSERT(clock_class);
 		ret = bt_clock_class_priority_map_add_clock_class(
 			trace->cc_prio_map, clock_class, 0);
-		BT_PUT(clock_class);
+		BT_OBJECT_PUT_REF_AND_RESET(clock_class);
 
 		if (ret) {
 			goto error;
@@ -195,7 +195,7 @@ enum bt_lttng_live_iterator_status lttng_live_metadata_update(
 	decoder_status = ctf_metadata_decoder_decode(metadata->decoder, fp);
 	switch (decoder_status) {
 	case CTF_METADATA_DECODER_STATUS_OK:
-		BT_PUT(trace->trace);
+		BT_OBJECT_PUT_REF_AND_RESET(trace->trace);
 		trace->trace = ctf_metadata_decoder_get_trace(metadata->decoder);
 		trace->new_metadata_needed = false;
 		status = lttng_live_update_clock_map(trace);