X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Fcommon%2Fmetadata%2Fctf-meta.h;h=bca30c7aa7c47f64c6c6ec66d1643f3cbaf769de;hb=4cdfc5e86b64137d96c31495cbdea99801714c2b;hp=a52995251998fc0220b1d2bac2d9d7ccaba559b3;hpb=c5b9b4417bedfbec9b5dd23b8395ccdd4eeffc44;p=babeltrace.git

diff --git a/plugins/ctf/common/metadata/ctf-meta.h b/plugins/ctf/common/metadata/ctf-meta.h
index a5299525..bca30c7a 100644
--- 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_field_class *ir_fc;
+	bt_field_class *ir_fc;
 };
 
 struct ctf_field_class_bit_array {
@@ -79,12 +79,12 @@ struct ctf_field_class_int {
 	struct ctf_field_class_bit_array base;
 	enum ctf_field_class_meaning meaning;
 	bool is_signed;
-	enum bt_field_class_integer_preferred_display_base disp_base;
+	bt_field_class_integer_preferred_display_base disp_base;
 	enum ctf_encoding encoding;
 	int64_t storing_index;
 
 	/* Owned by this */
-	struct bt_clock_class *mapped_clock_class;
+	bt_clock_class *mapped_clock_class;
 };
 
 struct ctf_range {
@@ -135,7 +135,7 @@ struct ctf_field_class_struct {
 };
 
 struct ctf_field_path {
-	enum bt_scope root;
+	bt_scope root;
 
 	/* Array of `int64_t` */
 	GArray *path;
@@ -188,7 +188,7 @@ struct ctf_event_class {
 	GString *name;
 	uint64_t id;
 	GString *emf_uri;
-	enum bt_event_class_log_level log_level;
+	bt_event_class_log_level log_level;
 	bool is_translated;
 
 	/* Owned by this */
@@ -198,7 +198,7 @@ struct ctf_event_class {
 	struct ctf_field_class *payload_fc;
 
 	/* Weak, set during translation */
-	struct bt_event_class *ir_ec;
+	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_clock_class *default_clock_class;
+	bt_clock_class *default_clock_class;
 
 	/* Weak, set during translation */
-	struct bt_stream_class *ir_sc;
+	bt_stream_class *ir_sc;
 };
 
 enum ctf_trace_class_env_entry_type {
@@ -257,7 +257,7 @@ struct ctf_trace_class {
 
 	uint64_t stored_value_count;
 
-	/* Array of `struct bt_clock_class *` (owned by this) */
+	/* Array of `bt_clock_class *` (owned by this) */
 	GPtrArray *clock_classes;
 
 	/* Array of `struct ctf_stream_class *` */
@@ -269,7 +269,7 @@ struct ctf_trace_class {
 	bool is_translated;
 
 	/* Weak, set during translation */
-	struct bt_trace_class *ir_tc;
+	bt_trace_class *ir_tc;
 };
 
 static inline
@@ -1542,17 +1542,17 @@ end:
 }
 
 static inline
-struct bt_clock_class *ctf_trace_class_borrow_clock_class_by_name(
+bt_clock_class *ctf_trace_class_borrow_clock_class_by_name(
 		struct ctf_trace_class *tc, const char *name)
 {
 	uint64_t i;
-	struct bt_clock_class *ret_cc = NULL;
+	bt_clock_class *ret_cc = NULL;
 
 	BT_ASSERT(tc);
 	BT_ASSERT(name);
 
 	for (i = 0; i < tc->clock_classes->len; i++) {
-		struct bt_clock_class *cc = tc->clock_classes->pdata[i];
+		bt_clock_class *cc = tc->clock_classes->pdata[i];
 		const char *cc_name = bt_clock_class_get_name(cc);
 
 		BT_ASSERT(cc_name);