X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Ftrace-ir%2Ffield-class-const.h;h=9f2f960b40ec9ff4b4b4612ef9eb8c9c70f2caa8;hb=9f7a7546c45e7501e749d19ebad3a31b7d715ef6;hp=c3c2d8eccaca20c4cb37a7a0b8b5b17bf2c35932;hpb=b7c5b62e2921b337eb4984eedb523e34e94e453b;p=deliverable%2Fbabeltrace.git

diff --git a/include/babeltrace/trace-ir/field-class-const.h b/include/babeltrace/trace-ir/field-class-const.h
index c3c2d8ecc..9f2f960b4 100644
--- a/include/babeltrace/trace-ir/field-class-const.h
+++ b/include/babeltrace/trace-ir/field-class-const.h
@@ -28,10 +28,11 @@
  */
 
 /*
- * For bt_bool, bt_field_class bt_field_path
- * bt_field_class_signed_enumeration_mapping_ranges
- * bt_field_class_unsigned_enumeration_mapping_ranges,
- * bt_field_class_enumeration_mapping_label_array
+ * For bt_bool, bt_field_class, bt_field_path,
+ * bt_field_class_enumeration_mapping,
+ * bt_field_class_unsigned_enumeration_mapping,
+ * bt_field_class_signed_enumeration_mapping,
+ * bt_field_class_enumeration_mapping_label_array, __BT_UPCAST_CONST
  */
 #include <babeltrace/types.h>
 
@@ -83,32 +84,44 @@ extern bt_bool bt_field_class_real_is_single_precision(
 extern uint64_t bt_field_class_enumeration_get_mapping_count(
 		const bt_field_class *field_class);
 
-extern void bt_field_class_unsigned_enumeration_borrow_mapping_by_index_const(
-		const bt_field_class *field_class, uint64_t index,
-		const char **label,
-		const bt_field_class_unsigned_enumeration_mapping_ranges **ranges);
+extern const bt_field_class_unsigned_enumeration_mapping *
+bt_field_class_unsigned_enumeration_borrow_mapping_by_index_const(
+		const bt_field_class *field_class, uint64_t index);
 
-extern void bt_field_class_signed_enumeration_borrow_mapping_by_index_const(
-		const bt_field_class *field_class, uint64_t index,
-		const char **label,
-		const bt_field_class_signed_enumeration_mapping_ranges **ranges);
+extern const bt_field_class_signed_enumeration_mapping *
+bt_field_class_signed_enumeration_borrow_mapping_by_index_const(
+		const bt_field_class *field_class, uint64_t index);
 
-extern uint64_t
-bt_field_class_unsigned_enumeration_mapping_ranges_get_range_count(
-		const bt_field_class_unsigned_enumeration_mapping_ranges *ranges);
+static inline
+const bt_field_class_enumeration_mapping *
+bt_field_class_unsigned_enumeration_mapping_as_mapping_const(
+		const bt_field_class_unsigned_enumeration_mapping *mapping)
+{
+	return __BT_UPCAST_CONST(bt_field_class_enumeration_mapping, mapping);
+}
+
+static inline
+const bt_field_class_enumeration_mapping *
+bt_field_class_signed_enumeration_mapping_as_mapping_const(
+		const bt_field_class_signed_enumeration_mapping *mapping)
+{
+	return __BT_UPCAST_CONST(bt_field_class_enumeration_mapping, mapping);
+}
 
-extern uint64_t
-bt_field_class_signed_enumeration_mapping_ranges_get_range_count(
-		const bt_field_class_signed_enumeration_mapping_ranges *ranges);
+extern const char *bt_field_class_enumeration_mapping_get_label(
+		const bt_field_class_enumeration_mapping *mapping);
+
+extern uint64_t bt_field_class_enumeration_mapping_get_range_count(
+		const bt_field_class_enumeration_mapping *mapping);
 
 extern void
-bt_field_class_unsigned_enumeration_mapping_ranges_get_range_by_index(
-		const bt_field_class_unsigned_enumeration_mapping_ranges *ranges,
+bt_field_class_unsigned_enumeration_mapping_get_range_by_index(
+		const bt_field_class_unsigned_enumeration_mapping *mapping,
 		uint64_t index, uint64_t *lower, uint64_t *upper);
 
 extern void
-bt_field_class_signed_enumeration_mapping_ranges_get_range_by_index(
-		const bt_field_class_unsigned_enumeration_mapping_ranges *ranges,
+bt_field_class_signed_enumeration_mapping_get_range_by_index(
+		const bt_field_class_signed_enumeration_mapping *mapping,
 		uint64_t index, int64_t *lower, int64_t *upper);
 
 extern bt_field_class_status
@@ -126,15 +139,21 @@ bt_field_class_signed_enumeration_get_mapping_labels_by_value(
 extern uint64_t bt_field_class_structure_get_member_count(
 		const bt_field_class *field_class);
 
-extern void bt_field_class_structure_borrow_member_by_index_const(
-		const bt_field_class *struct_field_class, uint64_t index,
-		const char **name, const bt_field_class **field_class);
+extern const bt_field_class_structure_member *
+bt_field_class_structure_borrow_member_by_index_const(
+		const bt_field_class *field_class, uint64_t index);
 
-extern
-const bt_field_class *
-bt_field_class_structure_borrow_member_field_class_by_name_const(
+extern const bt_field_class_structure_member *
+bt_field_class_structure_borrow_member_by_name_const(
 		const bt_field_class *field_class, const char *name);
 
+extern const char *bt_field_class_structure_member_get_name(
+		const bt_field_class_structure_member *member);
+
+extern const bt_field_class *
+bt_field_class_structure_member_borrow_field_class_const(
+		const bt_field_class_structure_member *member);
+
 extern const bt_field_class *
 bt_field_class_array_borrow_element_field_class_const(
 		const bt_field_class *field_class);
@@ -153,15 +172,20 @@ bt_field_class_variant_borrow_selector_field_path_const(
 extern uint64_t bt_field_class_variant_get_option_count(
 		const bt_field_class *field_class);
 
-extern void bt_field_class_variant_borrow_option_by_index_const(
-		const bt_field_class *variant_field_class, uint64_t index,
-		const char **name, const bt_field_class **field_class);
+extern const bt_field_class_variant_option *
+bt_field_class_variant_borrow_option_by_index_const(
+		const bt_field_class *field_class, uint64_t index);
+
+extern const bt_field_class_variant_option *
+bt_field_class_variant_borrow_option_by_name_const(
+		const bt_field_class *field_class, const char *name);
 
-extern
-const bt_field_class *
-bt_field_class_variant_borrow_option_field_class_by_name_const(
-		const bt_field_class *field_class,
-		const char *name);
+extern const char *bt_field_class_variant_option_get_name(
+		const bt_field_class_variant_option *option);
+
+extern const bt_field_class *
+bt_field_class_variant_option_borrow_field_class_const(
+		const bt_field_class_variant_option *option);
 
 extern void bt_field_class_get_ref(const bt_field_class *field_class);