X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Ffield.c;h=f1d31ea9327761725b934d532542dce3323beb9e;hb=fabfe03472e26e997f9bfaec3fb075e6dbb029dd;hp=f10b893ddacbf5b41e5cc9743e7121916eb3b14e;hpb=fe4df857056b4a03898f1031f136359ce733b0f5;p=babeltrace.git

diff --git a/src/lib/trace-ir/field.c b/src/lib/trace-ir/field.c
index f10b893d..f1d31ea9 100644
--- a/src/lib/trace-ir/field.c
+++ b/src/lib/trace-ir/field.c
@@ -177,22 +177,25 @@ struct bt_field *create_variant_field(struct bt_field_class *);
 
 static
 struct bt_field *(* const field_create_funcs[])(struct bt_field_class *) = {
-	[BT_FIELD_CLASS_TYPE_BOOL]				= create_bool_field,
-	[BT_FIELD_CLASS_TYPE_BIT_ARRAY]				= create_bit_array_field,
-	[BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER]			= create_integer_field,
-	[BT_FIELD_CLASS_TYPE_SIGNED_INTEGER]			= create_integer_field,
-	[BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION]		= create_integer_field,
-	[BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION]		= create_integer_field,
-	[BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL]		= create_real_field,
-	[BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL]		= create_real_field,
-	[BT_FIELD_CLASS_TYPE_STRING]				= create_string_field,
-	[BT_FIELD_CLASS_TYPE_STRUCTURE]				= create_structure_field,
-	[BT_FIELD_CLASS_TYPE_STATIC_ARRAY]			= create_static_array_field,
-	[BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY]			= create_dynamic_array_field,
-	[BT_FIELD_CLASS_TYPE_OPTION]				= create_option_field,
-	[BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR]		= create_variant_field,
-	[BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR]	= create_variant_field,
-	[BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR]	= create_variant_field,
+	[BT_FIELD_CLASS_TYPE_BOOL]					= create_bool_field,
+	[BT_FIELD_CLASS_TYPE_BIT_ARRAY]					= create_bit_array_field,
+	[BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER]				= create_integer_field,
+	[BT_FIELD_CLASS_TYPE_SIGNED_INTEGER]				= create_integer_field,
+	[BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION]			= create_integer_field,
+	[BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION]			= create_integer_field,
+	[BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL]			= create_real_field,
+	[BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL]			= create_real_field,
+	[BT_FIELD_CLASS_TYPE_STRING]					= create_string_field,
+	[BT_FIELD_CLASS_TYPE_STRUCTURE]					= create_structure_field,
+	[BT_FIELD_CLASS_TYPE_STATIC_ARRAY]				= create_static_array_field,
+	[BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY]				= create_dynamic_array_field,
+	[BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR]			= create_option_field,
+	[BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR]			= create_option_field,
+	[BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR]	= create_option_field,
+	[BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR]	= create_option_field,
+	[BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR]			= create_variant_field,
+	[BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR]		= create_variant_field,
+	[BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR]		= create_variant_field,
 };
 
 static
@@ -224,22 +227,25 @@ void destroy_variant_field(struct bt_field *field);
 
 static
 void (* const field_destroy_funcs[])(struct bt_field *) = {
-	[BT_FIELD_CLASS_TYPE_BOOL]				= destroy_bool_field,
-	[BT_FIELD_CLASS_TYPE_BIT_ARRAY]				= destroy_bit_array_field,
-	[BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER]			= destroy_integer_field,
-	[BT_FIELD_CLASS_TYPE_SIGNED_INTEGER]			= destroy_integer_field,
-	[BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION]		= destroy_integer_field,
-	[BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION]		= destroy_integer_field,
-	[BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL]		= destroy_real_field,
-	[BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL]		= destroy_real_field,
-	[BT_FIELD_CLASS_TYPE_STRING]				= destroy_string_field,
-	[BT_FIELD_CLASS_TYPE_STRUCTURE]				= destroy_structure_field,
-	[BT_FIELD_CLASS_TYPE_STATIC_ARRAY]			= destroy_array_field,
-	[BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY]			= destroy_array_field,
-	[BT_FIELD_CLASS_TYPE_OPTION]				= destroy_option_field,
-	[BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR]		= destroy_variant_field,
-	[BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR]	= destroy_variant_field,
-	[BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR]	= destroy_variant_field,
+	[BT_FIELD_CLASS_TYPE_BOOL]					= destroy_bool_field,
+	[BT_FIELD_CLASS_TYPE_BIT_ARRAY]					= destroy_bit_array_field,
+	[BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER]				= destroy_integer_field,
+	[BT_FIELD_CLASS_TYPE_SIGNED_INTEGER]				= destroy_integer_field,
+	[BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION]			= destroy_integer_field,
+	[BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION]			= destroy_integer_field,
+	[BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL]			= destroy_real_field,
+	[BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL]			= destroy_real_field,
+	[BT_FIELD_CLASS_TYPE_STRING]					= destroy_string_field,
+	[BT_FIELD_CLASS_TYPE_STRUCTURE]					= destroy_structure_field,
+	[BT_FIELD_CLASS_TYPE_STATIC_ARRAY]				= destroy_array_field,
+	[BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY]				= destroy_array_field,
+	[BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR]			= destroy_option_field,
+	[BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR]			= destroy_option_field,
+	[BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR]	= destroy_option_field,
+	[BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR]	= destroy_option_field,
+	[BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR]			= destroy_variant_field,
+	[BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR]		= destroy_variant_field,
+	[BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR]		= destroy_variant_field,
 };
 
 struct bt_field_class *bt_field_borrow_class(struct bt_field *field)
@@ -1060,8 +1066,7 @@ void bt_field_option_set_has_field(struct bt_field *field, bt_bool has_field)
 	struct bt_field_option *opt_field = (void *) field;
 
 	BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
-	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field,
-		BT_FIELD_CLASS_TYPE_OPTION, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_IS_OPTION(field, "Field");
 	BT_ASSERT_PRE_DEV_FIELD_HOT(field, "Field");
 
 	if (has_field) {
@@ -1076,8 +1081,7 @@ struct bt_field *bt_field_option_borrow_field(struct bt_field *field)
 	struct bt_field_option *opt_field = (void *) field;
 
 	BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
-	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field,
-		BT_FIELD_CLASS_TYPE_OPTION, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_IS_OPTION(field, "Field");
 	return opt_field->selected_field;
 }
 
@@ -1135,23 +1139,23 @@ bt_field_variant_borrow_selected_class_option_const(
 	return borrow_variant_field_selected_class_option(field);
 }
 
-const struct bt_field_class_variant_with_selector_unsigned_option *
-bt_field_variant_with_unsigned_selector_borrow_selected_class_option_const(
+const struct bt_field_class_variant_with_selector_integer_unsigned_option *
+bt_field_variant_with_unsigned_integer_selector_borrow_selected_class_option_const(
 		const struct bt_field *field)
 {
 	BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
 	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field,
-		BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR, "Field");
+		BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR, "Field");
 	return (const void *) borrow_variant_field_selected_class_option(field);
 }
 
-const struct bt_field_class_variant_with_selector_signed_option *
-bt_field_variant_with_signed_selector_borrow_selected_class_option_const(
+const struct bt_field_class_variant_with_selector_integer_signed_option *
+bt_field_variant_with_signed_integer_selector_borrow_selected_class_option_const(
 		const struct bt_field *field)
 {
 	BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
 	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field,
-		BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR, "Field");
+		BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR, "Field");
 	return (const void *) borrow_variant_field_selected_class_option(field);
 }