lib: bt_object_{get,put}_ref(): accept a `const` parameter

[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 a7c9f2d6db44d96c2aac34108c092ec1057e6c26..01d949466287b5652dd5ba8b1bc821420a4381cf 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,
-               struct bt_clock_class **clock_class)
+               struct bt_private_clock_class **clock_class)
 {
        int ret = 0;
        uint64_t i;
@@ -36,9 +36,9 @@ int find_mapped_clock_class(struct ctf_field_class *fc,
                goto end;
        }
 
-       switch (fc->id) {
-       case CTF_FIELD_CLASS_ID_INT:
-       case CTF_FIELD_CLASS_ID_ENUM:
+       switch (fc->type) {
+       case CTF_FIELD_CLASS_TYPE_INT:
+       case CTF_FIELD_CLASS_TYPE_ENUM:
        {
                struct ctf_field_class_int *int_fc = (void *) fc;
 
@@ -48,8 +48,12 @@ 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));
+                                       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)));
                                ret = -1;
                                goto end;
                        }
@@ -59,7 +63,7 @@ int find_mapped_clock_class(struct ctf_field_class *fc,
 
                break;
        }
-       case CTF_FIELD_CLASS_ID_STRUCT:
+       case CTF_FIELD_CLASS_TYPE_STRUCT:
        {
                struct ctf_field_class_struct *struct_fc = (void *) fc;
 
@@ -77,7 +81,7 @@ int find_mapped_clock_class(struct ctf_field_class *fc,
 
                break;
        }
-       case CTF_FIELD_CLASS_ID_VARIANT:
+       case CTF_FIELD_CLASS_TYPE_VARIANT:
        {
                struct ctf_field_class_variant *var_fc = (void *) fc;
 
@@ -95,8 +99,8 @@ int find_mapped_clock_class(struct ctf_field_class *fc,
 
                break;
        }
-       case CTF_FIELD_CLASS_ID_ARRAY:
-       case CTF_FIELD_CLASS_ID_SEQUENCE:
+       case CTF_FIELD_CLASS_TYPE_ARRAY:
+       case CTF_FIELD_CLASS_TYPE_SEQUENCE:
        {
                struct ctf_field_class_array_base *array_fc = (void *) fc;
 
@@ -120,7 +124,8 @@ int update_stream_class_default_clock_class(
                struct ctf_stream_class *stream_class)
 {
        int ret = 0;
-       struct bt_clock_class *clock_class = stream_class->default_clock_class;
+       struct bt_private_clock_class *clock_class =
+               stream_class->default_clock_class;
        uint64_t i;
 
        ret = find_mapped_clock_class(stream_class->packet_context_fc,
@@ -159,7 +164,8 @@ int update_stream_class_default_clock_class(
        }
 
        if (!stream_class->default_clock_class) {
-               stream_class->default_clock_class = bt_get(clock_class);
+               stream_class->default_clock_class = clock_class;
+               bt_object_get_ref(stream_class->default_clock_class);
        }
 
 end:
@@ -171,7 +177,7 @@ int ctf_trace_class_update_default_clock_classes(struct ctf_trace_class *ctf_tc)
 {
        uint64_t i;
        int ret = 0;
-       struct bt_clock_class *clock_class = NULL;
+       struct bt_private_clock_class *clock_class = NULL;
 
        ret = find_mapped_clock_class(ctf_tc->packet_header_fc,
                &clock_class);