switch (fc->type) {
case BT_FIELD_CLASS_TYPE_STRUCTURE:
- case BT_FIELD_CLASS_TYPE_VARIANT:
+ 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:
{
struct bt_field_class_named_field_class_container *container_fc =
(void *) fc;
for (i = 0; i < container_fc->named_fcs->len; i++) {
struct bt_named_field_class *named_fc =
- BT_FIELD_CLASS_NAMED_FC_AT_INDEX(
- container_fc, i);
+ container_fc->named_fcs->pdata[i];
struct bt_field_path_item item = {
.type = BT_FIELD_PATH_ITEM_TYPE_INDEX,
.index = i,
switch (parent_fc->type) {
case BT_FIELD_CLASS_TYPE_STRUCTURE:
- case BT_FIELD_CLASS_TYPE_VARIANT:
+ 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:
{
+ struct bt_field_class_named_field_class_container *container_fc =
+ (void *) parent_fc;
struct bt_named_field_class *named_fc;
BT_ASSERT(fp_item->type == BT_FIELD_PATH_ITEM_TYPE_INDEX);
- named_fc = BT_FIELD_CLASS_NAMED_FC_AT_INDEX(parent_fc,
- fp_item->index);
+ named_fc = container_fc->named_fcs->pdata[fp_item->index];
child_fc = named_fc->fc;
break;
}
if (fc->type == BT_FIELD_CLASS_TYPE_STATIC_ARRAY ||
fc->type == BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY ||
- fc->type == BT_FIELD_CLASS_TYPE_VARIANT) {
+ fc->type == BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR ||
+ fc->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR ||
+ fc->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR) {
is_valid = false;
goto end;
}
if (tgt_fc->type == BT_FIELD_CLASS_TYPE_STATIC_ARRAY ||
tgt_fc->type == BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY ||
- tgt_fc->type == BT_FIELD_CLASS_TYPE_VARIANT) {
+ tgt_fc->type == BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR ||
+ tgt_fc->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR ||
+ tgt_fc->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR) {
is_valid = false;
goto end;
}
switch (fc->type) {
case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
{
- struct bt_field_class_dynamic_array *dyn_array_fc = (void *) fc;
+ struct bt_field_class_array_dynamic *dyn_array_fc = (void *) fc;
if (dyn_array_fc->length_fc) {
BT_ASSERT(!dyn_array_fc->length_field_path);
break;
}
- case BT_FIELD_CLASS_TYPE_VARIANT:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR:
{
- struct bt_field_class_variant *var_fc = (void *) fc;
+ struct bt_field_class_variant_with_selector *var_fc =
+ (void *) fc;
if (var_fc->selector_fc) {
BT_ASSERT(!var_fc->selector_field_path);
var_fc->selector_field_path =
resolve_field_path(fc,
- var_fc->selector_fc, ctx);
+ (void *) var_fc->selector_fc, ctx);
if (!var_fc->selector_field_path) {
ret = -1;
goto end;
/* Recursive part */
switch (fc->type) {
case BT_FIELD_CLASS_TYPE_STRUCTURE:
- case BT_FIELD_CLASS_TYPE_VARIANT:
+ 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:
{
struct bt_field_class_named_field_class_container *container_fc =
(void *) fc;
for (i = 0; i < container_fc->named_fcs->len; i++) {
struct bt_named_field_class *named_fc =
- BT_FIELD_CLASS_NAMED_FC_AT_INDEX(
- container_fc, i);
+ container_fc->named_fcs->pdata[i];
ret = bt_resolve_field_paths(named_fc->fc, ctx);
if (ret) {