lib: split trace API into trace class and trace APIs

[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 557ba7e9b16187e4ab2c84aef5e1353d4dd9e6db..76e24d4274fea6c17b62213cd85f529c46b9cf6e 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
@@ -1108,7 +1107,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;
 }
 
@@ -1449,9 +1449,7 @@ 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);
        BT_ASSERT(tc->clock_classes);
@@ -1470,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) {