lib: make trace IR API const-correct

[babeltrace.git] / plugins / ctf / common / metadata / ctf-meta.h

diff --git a/plugins/ctf/common/metadata/ctf-meta.h b/plugins/ctf/common/metadata/ctf-meta.h
index cb84d77866031777a4dda929b5643058ac4ad26a..4c9aacf4c48e267b2dccdb8cf5509dccadbfb224 100644 (file)
--- a/plugins/ctf/common/metadata/ctf-meta.h
+++ b/plugins/ctf/common/metadata/ctf-meta.h
@@ -66,7 +66,7 @@ struct ctf_field_class {
        bool in_ir;
 
        /* Weak, set during translation. NULL if `in_ir` is false below. */
-       struct bt_private_field_class *ir_fc;
+       struct bt_field_class *ir_fc;
 };
 
 struct ctf_field_class_bit_array {
@@ -84,7 +84,7 @@ struct ctf_field_class_int {
        int64_t storing_index;
 
        /* Owned by this */
-       struct bt_private_clock_class *mapped_clock_class;
+       struct bt_clock_class *mapped_clock_class;
 };
 
 struct ctf_range {
@@ -198,7 +198,7 @@ struct ctf_event_class {
        struct ctf_field_class *payload_fc;
 
        /* Weak, set during translation */
-       struct bt_private_event_class *ir_ec;
+       struct bt_event_class *ir_ec;
 };
 
 struct ctf_stream_class {
@@ -224,10 +224,10 @@ struct ctf_stream_class {
        GHashTable *event_classes_by_id;
 
        /* Owned by this */
-       struct bt_private_clock_class *default_clock_class;
+       struct bt_clock_class *default_clock_class;
 
        /* Weak, set during translation */
-       struct bt_private_stream_class *ir_sc;
+       struct bt_stream_class *ir_sc;
 };
 
 enum ctf_trace_class_env_entry_type {
@@ -258,7 +258,7 @@ struct ctf_trace_class {
 
        uint64_t stored_value_count;
 
-       /* Array of `struct bt_private_clock_class *` (owned by this) */
+       /* Array of `struct bt_clock_class *` (owned by this) */
        GPtrArray *clock_classes;
 
        /* Array of `struct ctf_stream_class *` */
@@ -270,7 +270,7 @@ struct ctf_trace_class {
        bool is_translated;
 
        /* Weak, set during translation */
-       struct bt_private_trace *ir_tc;
+       struct bt_trace *ir_tc;
 };
 
 static inline
@@ -1108,7 +1108,8 @@ void ctf_field_class_int_copy_content(
        dst_fc->is_signed = src_fc->is_signed;
        dst_fc->disp_base = src_fc->disp_base;
        dst_fc->encoding = src_fc->encoding;
-       dst_fc->mapped_clock_class = bt_object_get_ref(src_fc->mapped_clock_class);
+       dst_fc->mapped_clock_class = src_fc->mapped_clock_class;
+       bt_object_get_ref(dst_fc->mapped_clock_class);
        dst_fc->storing_index = src_fc->storing_index;
 }
 
@@ -1548,19 +1549,18 @@ end:
 }
 
 static inline
-struct bt_private_clock_class *ctf_trace_class_borrow_clock_class_by_name(
+struct bt_clock_class *ctf_trace_class_borrow_clock_class_by_name(
                struct ctf_trace_class *tc, const char *name)
 {
        uint64_t i;
-       struct bt_private_clock_class *ret_cc = NULL;
+       struct bt_clock_class *ret_cc = NULL;
 
        BT_ASSERT(tc);
        BT_ASSERT(name);
 
        for (i = 0; i < tc->clock_classes->len; i++) {
-               struct bt_private_clock_class *cc = tc->clock_classes->pdata[i];
-               const char *cc_name = bt_clock_class_get_name(
-                       bt_private_clock_class_as_clock_class(cc));
+               struct bt_clock_class *cc = tc->clock_classes->pdata[i];
+               const char *cc_name = bt_clock_class_get_name(cc);
 
                BT_ASSERT(cc_name);
                if (strcmp(cc_name, name) == 0) {