lib: merge common CTF IR part with the remaining implementation

[babeltrace.git] / include / babeltrace / ctf-ir / validation-internal.h

diff --git a/include/babeltrace/ctf-ir/validation-internal.h b/include/babeltrace/ctf-ir/validation-internal.h
index 81d48b8f78f362f3773ff85d208b1b6355d433f8..2eaa8d6e875e50c0deddcb6a6ce56e1df2d31eef 100644 (file)
--- a/include/babeltrace/ctf-ir/validation-internal.h
+++ b/include/babeltrace/ctf-ir/validation-internal.h
@@ -28,13 +28,13 @@
 #include <babeltrace/values.h>
 #include <babeltrace/babeltrace-internal.h>
 
-struct bt_trace_common;
-struct bt_stream_class_common;
-struct bt_event_class_common;
-struct bt_field_type_common;
+struct bt_trace;
+struct bt_stream_class;
+struct bt_event_class;
+struct bt_field_type;
 
-typedef struct bt_field_type_common *(*bt_validation_flag_copy_field_type_func)(
-               struct bt_field_type_common *);
+typedef struct bt_field_type *(*bt_validation_flag_copy_field_type_func)(
+               struct bt_field_type *);
 
 enum bt_validation_flag {
        BT_VALIDATION_FLAG_TRACE        = 1,
@@ -52,12 +52,12 @@ enum bt_validation_flag {
  * `valid_flags` contains the results of the validation.
  */
 struct bt_validation_output {
-       struct bt_field_type_common *packet_header_type;
-       struct bt_field_type_common *packet_context_type;
-       struct bt_field_type_common *event_header_type;
-       struct bt_field_type_common *stream_event_ctx_type;
-       struct bt_field_type_common *event_context_type;
-       struct bt_field_type_common *event_payload_type;
+       struct bt_field_type *packet_header_type;
+       struct bt_field_type *packet_context_type;
+       struct bt_field_type *event_header_type;
+       struct bt_field_type *stream_event_ctx_type;
+       struct bt_field_type *event_context_type;
+       struct bt_field_type *event_payload_type;
        enum bt_validation_flag valid_flags;
 };
 
@@ -83,12 +83,12 @@ struct bt_validation_output {
  */
 BT_HIDDEN
 int bt_validate_class_types(struct bt_value *environment,
-               struct bt_field_type_common *packet_header_type,
-               struct bt_field_type_common *packet_context_type,
-               struct bt_field_type_common *event_header_type,
-               struct bt_field_type_common *stream_event_ctx_type,
-               struct bt_field_type_common *event_context_type,
-               struct bt_field_type_common *event_payload_type,
+               struct bt_field_type *packet_header_type,
+               struct bt_field_type *packet_context_type,
+               struct bt_field_type *event_header_type,
+               struct bt_field_type *stream_event_ctx_type,
+               struct bt_field_type *event_context_type,
+               struct bt_field_type *event_payload_type,
                int trace_valid, int stream_class_valid, int event_class_valid,
                struct bt_validation_output *output,
                enum bt_validation_flag validate_flags,
@@ -110,9 +110,9 @@ int bt_validate_class_types(struct bt_value *environment,
  * All parameters are owned by the caller.
  */
 BT_HIDDEN
-void bt_validation_replace_types(struct bt_trace_common *trace,
-               struct bt_stream_class_common *stream_class,
-               struct bt_event_class_common *event_class,
+void bt_validation_replace_types(struct bt_trace *trace,
+               struct bt_stream_class *stream_class,
+               struct bt_event_class *event_class,
                struct bt_validation_output *output,
                enum bt_validation_flag replace_flags);