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;
mapping_ranges = bt_field_class_enumeration_unsigned_mapping_borrow_ranges_const(
mapping);
- if (bt_integer_range_set_unsigned_compare(opt_ranges,
+ if (bt_integer_range_set_unsigned_is_equal(opt_ranges,
mapping_ranges)) {
/* We have a winner */
mapping_base =
mapping_ranges = bt_field_class_enumeration_signed_mapping_borrow_ranges_const(
mapping);
- if (bt_integer_range_set_signed_compare(opt_ranges,
+ if (bt_integer_range_set_signed_is_equal(opt_ranges,
mapping_ranges)) {
/* We have a winner */
mapping_base =
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);
opt_name_b =
bt_value_array_borrow_element_by_index_const(
prot_opt_names, j);
- if (bt_value_compare(opt_name_a, opt_name_b)) {
+ if (bt_value_is_equal(opt_name_a, opt_name_b)) {
/*
* Variant FC option names are not
* unique when protected.
case BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION:
ret = translate_integer_field_class(ctx);
break;
- case BT_FIELD_CLASS_TYPE_REAL:
+ case BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL:
+ case BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL:
ret = translate_real_field_class(ctx);
break;
case BT_FIELD_CLASS_TYPE_STRING:
case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
ret = translate_dynamic_array_field_class(ctx);
break;
- case BT_FIELD_CLASS_TYPE_OPTION:
+ case BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR:
+ case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR:
+ case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR:
+ case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR:
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:
{
uint64_t i;
uint64_t len;
- struct fs_sink_ctf_field_class_struct *struct_fc;
+ struct fs_sink_ctf_field_class_struct *struct_fc = NULL;
struct fs_sink_ctf_field_class_variant *var_fc = NULL;
struct fs_sink_ctf_named_field_class *named_fc;