X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Ftrace-ir%2Ffield-class.c;h=c1f1805883dca4628985b5062b2c3fc8e42ac960;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=d3af88b32409075819794acce61f4c6b5b897e64;hpb=7c06e3535597ab59a26c93c641964f1f25a10476;p=babeltrace.git

diff --git a/lib/trace-ir/field-class.c b/lib/trace-ir/field-class.c
index d3af88b3..c1f18058 100644
--- a/lib/trace-ir/field-class.c
+++ b/lib/trace-ir/field-class.c
@@ -22,24 +22,24 @@
  */
 
 #define BT_LOG_TAG "FIELD-CLASSES"
-#include <babeltrace/lib-logging-internal.h>
-
-#include <babeltrace/assert-pre-internal.h>
-#include <babeltrace/trace-ir/field-class.h>
-#include <babeltrace/trace-ir/field-class-const.h>
-#include <babeltrace/trace-ir/field-class-internal.h>
-#include <babeltrace/trace-ir/field-path-internal.h>
-#include <babeltrace/trace-ir/field-internal.h>
-#include <babeltrace/trace-ir/field-const.h>
-#include <babeltrace/trace-ir/field.h>
-#include <babeltrace/trace-ir/utils-internal.h>
-#include <babeltrace/trace-ir/clock-class.h>
-#include <babeltrace/trace-ir/clock-class-internal.h>
-#include <babeltrace/object-internal.h>
-#include <babeltrace/compiler-internal.h>
-#include <babeltrace/endian-internal.h>
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/compat/glib-internal.h>
+#include <babeltrace2/lib-logging-internal.h>
+
+#include <babeltrace2/assert-pre-internal.h>
+#include <babeltrace2/trace-ir/field-class.h>
+#include <babeltrace2/trace-ir/field-class-const.h>
+#include <babeltrace2/trace-ir/field-class-internal.h>
+#include <babeltrace2/trace-ir/field-path-internal.h>
+#include <babeltrace2/trace-ir/field-internal.h>
+#include <babeltrace2/trace-ir/field-const.h>
+#include <babeltrace2/trace-ir/field.h>
+#include <babeltrace2/trace-ir/utils-internal.h>
+#include <babeltrace2/trace-ir/clock-class.h>
+#include <babeltrace2/trace-ir/clock-class-internal.h>
+#include <babeltrace2/object-internal.h>
+#include <babeltrace2/compiler-internal.h>
+#include <babeltrace2/endian-internal.h>
+#include <babeltrace2/assert-internal.h>
+#include <babeltrace2/compat/glib-internal.h>
 #include <float.h>
 #include <inttypes.h>
 #include <stdlib.h>
@@ -291,64 +291,44 @@ uint64_t bt_field_class_enumeration_get_mapping_count(
 	return (uint64_t) enum_fc->mappings->len;
 }
 
-void bt_field_class_unsigned_enumeration_borrow_mapping_by_index_const(
-		const struct bt_field_class *fc, uint64_t index,
-		const char **name,
-		const struct bt_field_class_unsigned_enumeration_mapping_ranges **ranges)
+const struct bt_field_class_unsigned_enumeration_mapping *
+bt_field_class_unsigned_enumeration_borrow_mapping_by_index_const(
+		const struct bt_field_class *fc, uint64_t index)
 {
 	const struct bt_field_class_enumeration *enum_fc = (const void *) fc;
-	const struct bt_field_class_enumeration_mapping *mapping;
 
 	BT_ASSERT_PRE_NON_NULL(fc, "Field class");
-	BT_ASSERT_PRE_NON_NULL(name, "Name (output)");
-	BT_ASSERT_PRE_NON_NULL(ranges, "Ranges (output)");
 	BT_ASSERT_PRE_VALID_INDEX(index, enum_fc->mappings->len);
 	BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION,
 		"Field class");
-	mapping = BT_FIELD_CLASS_ENUM_MAPPING_AT_INDEX(fc, index);
-	*name = mapping->label->str;
-	*ranges = (void *) mapping;
+	return (const void *) BT_FIELD_CLASS_ENUM_MAPPING_AT_INDEX(fc, index);
 }
 
-void bt_field_class_signed_enumeration_borrow_mapping_by_index_const(
-		const struct bt_field_class *fc, uint64_t index,
-		const char **name,
-		const struct bt_field_class_signed_enumeration_mapping_ranges **ranges)
+const struct bt_field_class_signed_enumeration_mapping *
+bt_field_class_signed_enumeration_borrow_mapping_by_index_const(
+		const struct bt_field_class *fc, uint64_t index)
 {
 	const struct bt_field_class_enumeration *enum_fc = (const void *) fc;
-	const struct bt_field_class_enumeration_mapping *mapping;
 
 	BT_ASSERT_PRE_NON_NULL(fc, "Field class");
-	BT_ASSERT_PRE_NON_NULL(name, "Name (output)");
-	BT_ASSERT_PRE_NON_NULL(ranges, "Ranges (output)");
 	BT_ASSERT_PRE_VALID_INDEX(index, enum_fc->mappings->len);
 	BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION,
 		"Field class");
-	mapping = BT_FIELD_CLASS_ENUM_MAPPING_AT_INDEX(fc, index);
-	*name = mapping->label->str;
-	*ranges = (void *) mapping;
+	return (const void *) BT_FIELD_CLASS_ENUM_MAPPING_AT_INDEX(fc, index);
 }
 
-static inline
-uint64_t get_enumeration_field_class_mapping_range_count(
+const char *bt_field_class_enumeration_mapping_get_label(
 		const struct bt_field_class_enumeration_mapping *mapping)
 {
-	BT_ASSERT_PRE_NON_NULL(mapping, "Ranges");
-	return (uint64_t) mapping->ranges->len;
-}
-
-uint64_t bt_field_class_unsigned_enumeration_mapping_ranges_get_range_count(
-		const struct bt_field_class_unsigned_enumeration_mapping_ranges *ranges)
-{
-	return get_enumeration_field_class_mapping_range_count(
-		(const void *) ranges);
+	BT_ASSERT_PRE_NON_NULL(mapping, "Enumeration field class mapping");
+	return mapping->label->str;
 }
 
-uint64_t bt_field_class_signed_enumeration_mapping_ranges_get_range_count(
-		const struct bt_field_class_signed_enumeration_mapping_ranges *ranges)
+uint64_t bt_field_class_enumeration_mapping_get_range_count(
+		const struct bt_field_class_enumeration_mapping *mapping)
 {
-	return get_enumeration_field_class_mapping_range_count(
-		(const void *) ranges);
+	BT_ASSERT_PRE_NON_NULL(mapping, "Enumeration field class mapping");
+	return (uint64_t) mapping->ranges->len;
 }
 
 static inline
@@ -367,16 +347,16 @@ void get_enumeration_field_class_mapping_range_at_index(
 	*upper = range->upper.u;
 }
 
-void bt_field_class_unsigned_enumeration_mapping_ranges_get_range_by_index(
-		const struct bt_field_class_unsigned_enumeration_mapping_ranges *ranges,
+void bt_field_class_unsigned_enumeration_mapping_get_range_by_index(
+		const struct bt_field_class_unsigned_enumeration_mapping *ranges,
 		uint64_t index, uint64_t *lower, uint64_t *upper)
 {
 	get_enumeration_field_class_mapping_range_at_index(
 		(const void *) ranges, index, lower, upper);
 }
 
-void bt_field_class_signed_enumeration_mapping_ranges_get_range_by_index(
-		const struct bt_field_class_signed_enumeration_mapping_ranges *ranges,
+void bt_field_class_signed_enumeration_mapping_get_range_by_index(
+		const struct bt_field_class_signed_enumeration_mapping *ranges,
 		uint64_t index, int64_t *lower, int64_t *upper)
 {
 	get_enumeration_field_class_mapping_range_at_index(
@@ -384,8 +364,6 @@ void bt_field_class_signed_enumeration_mapping_ranges_get_range_by_index(
 		(uint64_t *) lower, (uint64_t *) upper);
 }
 
-
-
 enum bt_field_class_status
 bt_field_class_unsigned_enumeration_get_mapping_labels_by_value(
 		const struct bt_field_class *fc, uint64_t value,
@@ -882,7 +860,7 @@ bt_field_class_structure_borrow_member_by_name_const(
 }
 
 struct bt_field_class_structure_member *
-bt_field_class_structure_borrow_class_by_name(
+bt_field_class_structure_borrow_member_by_name(
 		struct bt_field_class *fc, const char *name)
 {
 	BT_ASSERT_PRE_NON_NULL(fc, "Field class");