X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Ftrace-ir%2Fprivate-field-classes.h;h=017091ac2e6c5983265e2f3fa5bf7cb8726ace14;hb=05e2128659970c32648a01255ed870449f05d518;hp=7463d3dc2cd9723a38340040aa54d11f700c5e5a;hpb=e5be10efe4d5543ba697c7e607ca0a5c33fa3ccb;p=babeltrace.git

diff --git a/include/babeltrace/trace-ir/private-field-classes.h b/include/babeltrace/trace-ir/private-field-classes.h
index 7463d3dc..017091ac 100644
--- a/include/babeltrace/trace-ir/private-field-classes.h
+++ b/include/babeltrace/trace-ir/private-field-classes.h
@@ -47,8 +47,12 @@ struct bt_private_field_path;
 struct bt_private_field_class_signed_enumeration_mapping_ranges;
 struct bt_private_field_class_unsigned_enumeration_mapping_ranges;
 
-extern struct bt_field_class *bt_field_class_borrow_from_private(
-		struct bt_private_field_class *priv_field_class);
+static inline
+struct bt_field_class *bt_private_field_class_as_field_class(
+		struct bt_private_field_class *priv_field_class)
+{
+	return (void *) priv_field_class;
+}
 
 extern struct bt_private_field_class *
 bt_private_field_class_unsigned_integer_create(void);
@@ -56,16 +60,16 @@ bt_private_field_class_unsigned_integer_create(void);
 extern struct bt_private_field_class *
 bt_private_field_class_signed_integer_create(void);
 
-extern int bt_private_field_class_integer_set_field_value_range(
+extern void bt_private_field_class_integer_set_field_value_range(
 		struct bt_private_field_class *field_class, uint64_t size);
 
-extern int bt_private_field_class_integer_set_preferred_display_base(
+extern void bt_private_field_class_integer_set_preferred_display_base(
 		struct bt_private_field_class *field_class,
 		enum bt_field_class_integer_preferred_display_base base);
 
 extern struct bt_private_field_class *bt_private_field_class_real_create(void);
 
-extern int bt_private_field_class_real_set_is_single_precision(
+extern void bt_private_field_class_real_set_is_single_precision(
 		struct bt_private_field_class *field_class,
 		bt_bool is_single_precision);
 
@@ -92,17 +96,17 @@ bt_private_field_class_string_create(void);
 extern struct bt_private_field_class *
 bt_private_field_class_structure_create(void);
 
-extern void bt_private_field_class_structure_borrow_private_member_by_index(
+extern void bt_private_field_class_structure_borrow_member_by_index(
 		struct bt_private_field_class *struct_field_class,
 		uint64_t index, const char **name,
 		struct bt_private_field_class **field_class);
 
 extern
 struct bt_private_field_class *
-bt_private_field_class_structure_borrow_member_private_field_class_by_name(
+bt_private_field_class_structure_borrow_member_field_class_by_name(
 		struct bt_private_field_class *field_class, const char *name);
 
-extern int bt_private_field_class_structure_append_private_member(
+extern int bt_private_field_class_structure_append_member(
 		struct bt_private_field_class *struct_field_class,
 		const char *name, struct bt_private_field_class *field_class);
 
@@ -116,28 +120,28 @@ bt_private_field_class_dynamic_array_create(
 		struct bt_private_field_class *elem_field_class);
 
 extern struct bt_private_field_class *
-bt_private_field_class_array_borrow_element_private_field_class(
+bt_private_field_class_array_borrow_element_field_class(
 		struct bt_private_field_class *field_class);
 
-extern int bt_private_field_class_dynamic_array_set_length_private_field_class(
+extern int bt_private_field_class_dynamic_array_set_length_field_class(
 		struct bt_private_field_class *field_class,
 		struct bt_private_field_class *length_field_class);
 
 extern struct bt_private_field_class *
 bt_private_field_class_variant_create(void);
 
-extern int bt_private_field_class_variant_set_selector_private_field_class(
+extern int bt_private_field_class_variant_set_selector_field_class(
 		struct bt_private_field_class *field_class,
 		struct bt_private_field_class *selector_field_class);
 
-extern void bt_private_field_class_variant_borrow_private_option_by_index(
+extern void bt_private_field_class_variant_borrow_option_by_index(
 		struct bt_private_field_class *variant_field_class,
 		uint64_t index, const char **name,
 		struct bt_private_field_class **field_class);
 
 extern
 struct bt_private_field_class *
-bt_private_field_class_variant_borrow_option_private_field_class_by_name(
+bt_private_field_class_variant_borrow_option_field_class_by_name(
 		struct bt_private_field_class *field_class, const char *name);
 
 extern int bt_private_field_class_variant_append_private_option(