X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-sink%2Ftranslate-trace-ir-to-ctf-ir.c;h=f2a2c7175527e9708ea54d12b329a968716e83e5;hb=fabfe03472e26e997f9bfaec3fb075e6dbb029dd;hp=1b0e8e7a3c5de3f8f1f4105a3dff3f2e18116cf8;hpb=0aa006b7775f9578e37c0f006df795e903d25acc;p=babeltrace.git

diff --git a/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c b/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c
index 1b0e8e7a..f2a2c717 100644
--- a/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c
+++ b/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c
@@ -833,26 +833,26 @@ int maybe_protect_variant_option_name(const bt_field_class *ir_var_fc,
 	if (ir_var_fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR) {
 		/* No ranges: we're done */
 		goto end;
-	} if (ir_var_fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR) {
-		const bt_field_class_variant_with_selector_unsigned_option *var_opt =
-			bt_field_class_variant_with_selector_unsigned_borrow_option_by_index_const(
+	} if (ir_var_fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR) {
+		const bt_field_class_variant_with_selector_integer_unsigned_option *var_opt =
+			bt_field_class_variant_with_selector_integer_unsigned_borrow_option_by_index_const(
 				ir_var_fc, opt_i);
 		opt_ranges =
-			bt_field_class_variant_with_selector_unsigned_option_borrow_ranges_const(
+			bt_field_class_variant_with_selector_integer_unsigned_option_borrow_ranges_const(
 				var_opt);
 	} else {
-		const bt_field_class_variant_with_selector_signed_option *var_opt =
-			bt_field_class_variant_with_selector_signed_borrow_option_by_index_const(
+		const bt_field_class_variant_with_selector_integer_signed_option *var_opt =
+			bt_field_class_variant_with_selector_integer_signed_borrow_option_by_index_const(
 				ir_var_fc, opt_i);
 		opt_ranges =
-			bt_field_class_variant_with_selector_signed_option_borrow_ranges_const(
+			bt_field_class_variant_with_selector_integer_signed_option_borrow_ranges_const(
 				var_opt);
 	}
 
 	/* Find corresponding mapping by range set in selector FC */
 	for (i = 0; i < bt_field_class_enumeration_get_mapping_count(ir_tag_fc);
 			i++) {
-		if (ir_var_fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR) {
+		if (ir_var_fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR) {
 			const bt_field_class_enumeration_mapping *mapping_base;
 			const bt_field_class_enumeration_unsigned_mapping *mapping;
 			const bt_integer_range_set_unsigned *mapping_ranges;
@@ -999,8 +999,8 @@ int translate_variant_field_class(struct ctx *ctx)
 	ir_fc_type = bt_field_class_get_type(fc->base.ir_fc);
 	opt_count = bt_field_class_variant_get_option_count(fc->base.ir_fc);
 
-	if (ir_fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR ||
-			ir_fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR) {
+	if (ir_fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR ||
+			ir_fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR) {
 		ir_selector_field_path = bt_field_class_variant_with_selector_borrow_selector_field_path_const(
 			fc->base.ir_fc);
 		BT_ASSERT(ir_selector_field_path);
@@ -1341,8 +1341,8 @@ int translate_field_class(struct ctx *ctx)
 		ret = translate_option_field_class(ctx);
 		break;
 	case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR:
 		ret = translate_variant_field_class(ctx);
 		break;
 	default: