From b74f1a204b0156d8cf95a81b2ec3508b8ae6381b Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Mon, 8 Feb 2016 03:26:40 -0500 Subject: [PATCH] ir: rename bt_ctf_field_path_get_root() 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/field-path.c | 2 +- include/babeltrace/ctf-ir/field-path.h | 4 ++-- tests/lib/test_bt_ctf_field_type_validation.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/formats/ctf/ir/field-path.c b/formats/ctf/ir/field-path.c index 67a90b48..44de8cd4 100644 --- a/formats/ctf/ir/field-path.c +++ b/formats/ctf/ir/field-path.c @@ -96,7 +96,7 @@ end: return new_path; } -enum bt_ctf_scope bt_ctf_field_path_get_root( +enum bt_ctf_scope bt_ctf_field_path_get_root_scope( const struct bt_ctf_field_path *field_path) { enum bt_ctf_scope scope = BT_CTF_SCOPE_UNKNOWN; diff --git a/include/babeltrace/ctf-ir/field-path.h b/include/babeltrace/ctf-ir/field-path.h index 5a0ec2af..ffcaae00 100644 --- a/include/babeltrace/ctf-ir/field-path.h +++ b/include/babeltrace/ctf-ir/field-path.h @@ -37,7 +37,7 @@ extern "C" { struct bt_ctf_field_path; /* - * bt_ctf_field_path_get_root: get the root node of a field path. + * bt_ctf_field_path_get_root_scope: get the root node of a field path. * * Get the field path's root node. * @@ -45,7 +45,7 @@ struct bt_ctf_field_path; * * Returns the root node of a field path, or BT_CTF_SCOPE_UNKNOWN on error. */ -extern enum bt_ctf_scope bt_ctf_field_path_get_root( +extern enum bt_ctf_scope bt_ctf_field_path_get_root_scope( const struct bt_ctf_field_path *field_path); /* diff --git a/tests/lib/test_bt_ctf_field_type_validation.c b/tests/lib/test_bt_ctf_field_type_validation.c index 0e8b0788..6338a7b3 100644 --- a/tests/lib/test_bt_ctf_field_type_validation.c +++ b/tests/lib/test_bt_ctf_field_type_validation.c @@ -1662,7 +1662,7 @@ int validate_field_path(struct bt_ctf_field_type *field_type, goto end; } - if (bt_ctf_field_path_get_root(field_path) != root) { + if (bt_ctf_field_path_get_root_scope(field_path) != root) { ret = -1; goto end; } -- 2.34.1