From 4b5fcb7804d8f1ec451a6e902349c0533f9e4fb9 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Mon, 8 Feb 2016 02:43:49 -0500 Subject: [PATCH] ir: rename bt_ctf_field_type_variant_set_tag() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- formats/ctf/ir/event-types.c | 2 +- formats/ctf/ir/resolve.c | 3 ++- include/babeltrace/ctf-ir/event-types-internal.h | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/formats/ctf/ir/event-types.c b/formats/ctf/ir/event-types.c index 1d53c609..4e845f0e 100644 --- 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 fd454010..fe2e3859 100644 --- 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 a8abef35..a4ccd2e8 100644 --- 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 -- 2.34.1