X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Fvisitor.c;h=115b54ac95eb8e2da2a74c0896c84759188d35d8;hb=d9a13d8630473a4b4da6f00610a07647b05ba80f;hp=762dce22df4a04af4a32d4038daac0d352131bd9;hpb=e5bc7f813987de3dc50f218f77b43e3d04e7a0f8;p=babeltrace.git

diff --git a/formats/ctf/ir/visitor.c b/formats/ctf/ir/visitor.c
index 762dce22..115b54ac 100644
--- a/formats/ctf/ir/visitor.c
+++ b/formats/ctf/ir/visitor.c
@@ -30,11 +30,11 @@
 #include <babeltrace/ref.h>
 
 BT_HIDDEN
-int visitor_helper(struct bt_ctf_ir_element *root,
+int visitor_helper(struct bt_ctf_object *root,
 		bt_child_count_accessor child_counter,
 		bt_child_accessor child_accessor,
 		bt_child_visitor child_visitor,
-		bt_ctf_ir_visitor visitor,
+		bt_ctf_visitor visitor,
 		void *data)
 {
 	int ret, child_count, i;
@@ -44,7 +44,7 @@ int visitor_helper(struct bt_ctf_ir_element *root,
 		goto end;
 	}
 
-	child_count = child_counter(root->element);
+	child_count = child_counter(root->object);
 	if (child_count < 0) {
 		ret = child_count;
 		goto end;
@@ -53,7 +53,7 @@ int visitor_helper(struct bt_ctf_ir_element *root,
 	for (i = 0; i < child_count; i++) {
 		void *child;
 
-		child = child_accessor(root->element, i);
+		child = child_accessor(root->object, i);
 		if (!child) {
 			ret = -1;
 			goto end;
@@ -68,29 +68,28 @@ end:
 	return ret;
 }
 
-enum bt_ctf_ir_type bt_ctf_ir_element_get_type(
-		struct bt_ctf_ir_element *element)
+enum bt_ctf_object_type bt_ctf_object_get_type(struct bt_ctf_object *object)
 {
-	enum bt_ctf_ir_type ret = BT_CTF_IR_TYPE_UNKNOWN;
-	
-	if (!element) {
+	enum bt_ctf_object_type ret = BT_CTF_OBJECT_TYPE_UNKNOWN;
+
+	if (!object) {
 		goto end;
 	}
 
-	ret = element->type;
+	ret = object->type;
 end:
 	return ret;
 }
 
-void *bt_ctf_ir_element_get_element(struct bt_ctf_ir_element *element)
+void *bt_ctf_object_get_object(struct bt_ctf_object *object)
 {
 	void *ret = NULL;
 
-	if (!element) {
+	if (!object) {
 		goto end;
 	}
 
-	ret = element->element;
+	ret = object->object;
 end:
 	return ret;
 }