assert-pre-internal.h: add BT_ASSERT_PRE_VALID_INDEX()

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

diff --git a/include/babeltrace/ctf-ir/visitor-internal.h b/include/babeltrace/ctf-ir/visitor-internal.h
index a8fd1ae92fa7bfc52cf3fcecf3bef6bf70aaba57..3f8d80929d72aa81eaa170610225f383e8068318 100644 (file)
--- a/include/babeltrace/ctf-ir/visitor-internal.h
+++ b/include/babeltrace/ctf-ir/visitor-internal.h
@@ -30,22 +30,22 @@
 #include <babeltrace/ctf-ir/visitor.h>
 #include <babeltrace/babeltrace-internal.h>
 
-typedef void *(*bt_child_accessor)(void *element, int index);
-typedef int (*bt_child_count_accessor)(void *element);
-typedef int (*bt_child_visitor)(void *element, bt_ctf_ir_visitor visitor,
+typedef void *(*bt_child_accessor)(void *object, int index);
+typedef int64_t (*bt_child_count_accessor)(void *object);
+typedef int (*bt_child_visitor)(void *object, bt_visitor visitor,
                void *data);
 
-struct bt_ctf_ir_element {
-       enum bt_ctf_ir_type type;
-       void *element;
+struct bt_visitor_object {
+       enum bt_visitor_object_type type;
+       void *object;
 };
 
 BT_HIDDEN
-int visitor_helper(struct bt_ctf_ir_element *root,
+int visitor_helper(struct bt_visitor_object *root,
                bt_child_count_accessor child_counter,
                bt_child_accessor child_accessor,
                bt_child_visitor child_visitor,
-               bt_ctf_ir_visitor visitor,
+               bt_visitor visitor,
                void *data);
 
 #endif /* BABELTRACE_CTF_IR_VISITOR_INTERNAL_H */