X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Fcommon%2Fmetadata%2Fctf-meta-update-default-clock-classes.c;h=057e0b4eb31725202ebb92b6807b5cf2b8f7e3a2;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=01d949466287b5652dd5ba8b1bc821420a4381cf;hpb=398454ed067b95215c7affbe265fd36edab931ee;p=babeltrace.git

diff --git a/plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.c b/plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.c
index 01d94946..057e0b4e 100644
--- a/plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.c
+++ b/plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.c
@@ -15,9 +15,9 @@
 #define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-UPDATE-DEF-CC"
 #include "logging.h"
 
-#include <babeltrace/babeltrace.h>
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/assert-internal.h>
+#include <babeltrace2/babeltrace.h>
+#include <babeltrace2/babeltrace-internal.h>
+#include <babeltrace2/assert-internal.h>
 #include <glib.h>
 #include <stdint.h>
 #include <string.h>
@@ -27,7 +27,7 @@
 
 static inline
 int find_mapped_clock_class(struct ctf_field_class *fc,
-		struct bt_private_clock_class **clock_class)
+		struct ctf_clock_class **clock_class)
 {
 	int ret = 0;
 	uint64_t i;
@@ -48,12 +48,8 @@ int find_mapped_clock_class(struct ctf_field_class *fc,
 				BT_LOGE("Stream class contains more than one "
 					"clock class: expected-cc-name=\"%s\", "
 					"other-cc-name=\"%s\"",
-					bt_clock_class_get_name(
-						bt_private_clock_class_as_clock_class(
-							*clock_class)),
-					bt_clock_class_get_name(
-						bt_private_clock_class_as_clock_class(
-							int_fc->mapped_clock_class)));
+					(*clock_class)->name->str,
+					int_fc->mapped_clock_class->name->str);
 				ret = -1;
 				goto end;
 			}
@@ -124,7 +120,7 @@ int update_stream_class_default_clock_class(
 		struct ctf_stream_class *stream_class)
 {
 	int ret = 0;
-	struct bt_private_clock_class *clock_class =
+	struct ctf_clock_class *clock_class =
 		stream_class->default_clock_class;
 	uint64_t i;
 
@@ -165,7 +161,6 @@ int update_stream_class_default_clock_class(
 
 	if (!stream_class->default_clock_class) {
 		stream_class->default_clock_class = clock_class;
-		bt_object_get_ref(stream_class->default_clock_class);
 	}
 
 end:
@@ -177,10 +172,9 @@ int ctf_trace_class_update_default_clock_classes(struct ctf_trace_class *ctf_tc)
 {
 	uint64_t i;
 	int ret = 0;
-	struct bt_private_clock_class *clock_class = NULL;
+	struct ctf_clock_class *clock_class = NULL;
 
-	ret = find_mapped_clock_class(ctf_tc->packet_header_fc,
-		&clock_class);
+	ret = find_mapped_clock_class(ctf_tc->packet_header_fc, &clock_class);
 	if (ret) {
 		goto end;
 	}