From: Francis Deslauriers <francis.deslauriers@efficios.com>
Date: Tue, 16 Apr 2019 20:45:57 +0000 (-0400)
Subject: Fix: lib: Mismatch in function declarations and definitions
X-Git-Tag: v2.0.0-pre5~86
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=c0db9072d160e8aa1b71d4c10b26e917cf9fdf22

Fix: lib: Mismatch in function declarations and definitions

Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
---

diff --git a/include/babeltrace/trace-ir/field-class.h b/include/babeltrace/trace-ir/field-class.h
index 1da111d2..985eecd9 100644
--- a/include/babeltrace/trace-ir/field-class.h
+++ b/include/babeltrace/trace-ir/field-class.h
@@ -127,7 +127,7 @@ bt_field_class_variant_borrow_option_by_index(
 
 extern bt_field_class_variant_option *
 bt_field_class_variant_borrow_option_by_name(
-		bt_field_class *field_class, char *name);
+		bt_field_class *field_class, const char *name);
 
 extern bt_field_class *bt_field_class_variant_option_borrow_field_class(
 		bt_field_class_variant_option *option);
diff --git a/lib/trace-ir/field-class.c b/lib/trace-ir/field-class.c
index baee7793..d3af88b3 100644
--- a/lib/trace-ir/field-class.c
+++ b/lib/trace-ir/field-class.c
@@ -870,7 +870,7 @@ end:
 }
 
 const struct bt_field_class_structure_member *
-bt_field_class_structure_borrow_member_field_class_by_name_const(
+bt_field_class_structure_borrow_member_by_name_const(
 		const struct bt_field_class *fc, const char *name)
 {
 	BT_ASSERT_PRE_NON_NULL(fc, "Field class");
@@ -882,7 +882,7 @@ bt_field_class_structure_borrow_member_field_class_by_name_const(
 }
 
 struct bt_field_class_structure_member *
-bt_field_class_structure_borrow_member_field_class_by_name(
+bt_field_class_structure_borrow_class_by_name(
 		struct bt_field_class *fc, const char *name)
 {
 	BT_ASSERT_PRE_NON_NULL(fc, "Field class");
@@ -996,7 +996,7 @@ enum bt_field_class_status bt_field_class_variant_append_option(
 }
 
 const struct bt_field_class_variant_option *
-bt_field_class_variant_borrow_option_field_class_by_name_const(
+bt_field_class_variant_borrow_option_by_name_const(
 		const struct bt_field_class *fc, const char *name)
 {
 	BT_ASSERT_PRE_NON_NULL(fc, "Field class");
@@ -1007,7 +1007,7 @@ bt_field_class_variant_borrow_option_field_class_by_name_const(
 }
 
 struct bt_field_class_variant_option *
-bt_field_class_variant_borrow_option_field_class_by_name(
+bt_field_class_variant_borrow_option_by_name(
 		struct bt_field_class *fc, const char *name)
 {
 	BT_ASSERT_PRE_NON_NULL(fc, "Field class");