bt_clock_class_create(): accept mandatory trace class

[babeltrace.git] / plugins / ctf / common / metadata / ctf-meta-update-default-clock-classes.c

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 335f608accb8d72939d2ad3f9799b05e56ddecdb..398d977bda38300cd65821bfc45ef21453b0a86a 100644 (file)
--- a/plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.c
+++ b/plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.c
@@ -27,7 +27,7 @@
 
 static inline
 int find_mapped_clock_class(struct ctf_field_class *fc,
-               bt_clock_class **clock_class)
+               struct ctf_clock_class **clock_class)
 {
        int ret = 0;
        uint64_t i;
@@ -48,8 +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(*clock_class),
-                                       bt_clock_class_get_name(int_fc->mapped_clock_class));
+                                       (*clock_class)->name->str,
+                                       int_fc->mapped_clock_class->name->str);
                                ret = -1;
                                goto end;
                        }
@@ -120,7 +120,7 @@ int update_stream_class_default_clock_class(
                struct ctf_stream_class *stream_class)
 {
        int ret = 0;
-       bt_clock_class *clock_class =
+       struct ctf_clock_class *clock_class =
                stream_class->default_clock_class;
        uint64_t i;
 
@@ -161,7 +161,6 @@ int update_stream_class_default_clock_class(
 
        if (!stream_class->default_clock_class) {
                stream_class->default_clock_class = clock_class;
-               bt_clock_class_get_ref(stream_class->default_clock_class);
        }
 
 end:
@@ -173,10 +172,9 @@ int ctf_trace_class_update_default_clock_classes(struct ctf_trace_class *ctf_tc)
 {
        uint64_t i;
        int ret = 0;
-       bt_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;
        }