lib: make public reference count functions have strict types

[deliverable/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 4c9aacf4c48e267b2dccdb8cf5509dccadbfb224..a52995251998fc0220b1d2bac2d9d7ccaba559b3 100644 (file)
--- a/plugins/ctf/common/metadata/ctf-meta.h
+++ b/plugins/ctf/common/metadata/ctf-meta.h
@@ -246,7 +246,6 @@ struct ctf_trace_class_env_entry {
 };
 
 struct ctf_trace_class {
-       GString *name;
        unsigned int major;
        unsigned int minor;
        uint8_t uuid[16];
@@ -270,7 +269,7 @@ struct ctf_trace_class {
        bool is_translated;
 
        /* Weak, set during translation */
-       struct bt_trace *ir_tc;
+       struct bt_trace_class *ir_tc;
 };
 
 static inline
@@ -472,7 +471,7 @@ static inline
 void _ctf_field_class_int_destroy(struct ctf_field_class_int *fc)
 {
        BT_ASSERT(fc);
-       bt_object_put_ref(fc->mapped_clock_class);
+       bt_clock_class_put_ref(fc->mapped_clock_class);
        g_free(fc);
 }
 
@@ -480,7 +479,7 @@ static inline
 void _ctf_field_class_enum_destroy(struct ctf_field_class_enum *fc)
 {
        BT_ASSERT(fc);
-       bt_object_put_ref(fc->base.mapped_clock_class);
+       bt_clock_class_put_ref(fc->base.mapped_clock_class);
 
        if (fc->mappings) {
                uint64_t i;
@@ -1109,7 +1108,7 @@ void ctf_field_class_int_copy_content(
        dst_fc->disp_base = src_fc->disp_base;
        dst_fc->encoding = src_fc->encoding;
        dst_fc->mapped_clock_class = src_fc->mapped_clock_class;
-       bt_object_get_ref(dst_fc->mapped_clock_class);
+       bt_clock_class_get_ref(dst_fc->mapped_clock_class);
        dst_fc->storing_index = src_fc->storing_index;
 }
 
@@ -1398,7 +1397,7 @@ void ctf_stream_class_destroy(struct ctf_stream_class *sc)
        ctf_field_class_destroy(sc->packet_context_fc);
        ctf_field_class_destroy(sc->event_header_fc);
        ctf_field_class_destroy(sc->event_common_context_fc);
-       bt_object_put_ref(sc->default_clock_class);
+       bt_clock_class_put_ref(sc->default_clock_class);
        g_free(sc);
 }
 
@@ -1450,11 +1449,9 @@ struct ctf_trace_class *ctf_trace_class_create(void)
        struct ctf_trace_class *tc = g_new0(struct ctf_trace_class, 1);
 
        BT_ASSERT(tc);
-       tc->name = g_string_new(NULL);
        tc->default_byte_order = -1;
-       BT_ASSERT(tc->name);
        tc->clock_classes = g_ptr_array_new_with_free_func(
-               (GDestroyNotify) bt_object_put_ref);
+               (GDestroyNotify) bt_clock_class_put_ref);
        BT_ASSERT(tc->clock_classes);
        tc->stream_classes = g_ptr_array_new_with_free_func(
                (GDestroyNotify) ctf_stream_class_destroy);
@@ -1471,10 +1468,6 @@ void ctf_trace_class_destroy(struct ctf_trace_class *tc)
                return;
        }
 
-       if (tc->name) {
-               g_string_free(tc->name, TRUE);
-       }
-
        ctf_field_class_destroy(tc->packet_header_fc);
 
        if (tc->clock_classes) {