ir: rename bt_ctf_field_type_variant_set_tag()

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/formats/ctf/ir/event-types.c b/formats/ctf/ir/event-types.c
index 1d53c609a95a5c0cc11cb16663c11407bc92ba84..4e845f0ea8b6b1f9dccd1a44ae1f3bd10169a523 100644 (file)
--- a/formats/ctf/ir/event-types.c
+++ b/formats/ctf/ir/event-types.c
@@ -2584,7 +2584,7 @@ struct bt_ctf_field_path *bt_ctf_field_type_variant_get_tag_field_path(
 }
 
 BT_HIDDEN
-int bt_ctf_field_type_variant_set_tag(struct bt_ctf_field_type *type,
+int bt_ctf_field_type_variant_set_tag_field_type(struct bt_ctf_field_type *type,
                struct bt_ctf_field_type *tag)
 {
        int ret = 0;

diff --git a/formats/ctf/ir/resolve.c b/formats/ctf/ir/resolve.c
index fd4540108d7baabeec76f4cc6eee48ea0d4806e5..fe2e38590bdf22544649f7184611e0dccfcddd28 100644 (file)
--- a/formats/ctf/ir/resolve.c
+++ b/formats/ctf/ir/resolve.c
@@ -973,7 +973,8 @@ int resolve_sequence_or_variant_type(struct bt_ctf_field_type *type,
 
                target_field_path = NULL;
 
-               ret = bt_ctf_field_type_variant_set_tag(type, target_type);
+               ret = bt_ctf_field_type_variant_set_tag_field_type(
+                       type, target_type);
                if (ret) {
                        _printf_error("Cannot set variant field type's tag field type\n");
                        goto end;

diff --git a/include/babeltrace/ctf-ir/event-types-internal.h b/include/babeltrace/ctf-ir/event-types-internal.h
index a8abef35ef6430c4d5ee42c9447094c7fddfd4f7..a4ccd2e8b76613999b756fa6d4c1c11b33ffe38a 100644 (file)
--- a/include/babeltrace/ctf-ir/event-types-internal.h
+++ b/include/babeltrace/ctf-ir/event-types-internal.h
@@ -264,8 +264,8 @@ struct bt_ctf_field_path *bt_ctf_field_type_variant_get_tag_field_path(
                struct bt_ctf_field_type *type);
 
 BT_HIDDEN
-int bt_ctf_field_type_variant_set_tag(struct bt_ctf_field_type *type,
-               struct bt_ctf_field_type *tag);
+int bt_ctf_field_type_variant_set_tag_field_type(struct bt_ctf_field_type *type,
+               struct bt_ctf_field_type *tag_type);
 
 /* Replace an existing field's type in a variant */
 BT_HIDDEN