X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fctf-writer%2Ffield-types.c;h=a2986abf9c30545197bdd7030c7727814cc7758e;hb=d50d46f31cc000f03601eeaf8a0806a0c183c1d0;hp=50f943c351bba2b9cda84072e81a12ac5646ff07;hpb=c8a4375195b0ca586c43e5733dfc0266b4ba8a50;p=babeltrace.git diff --git a/src/ctf-writer/field-types.c b/src/ctf-writer/field-types.c index 50f943c3..a2986abf 100644 --- a/src/ctf-writer/field-types.c +++ b/src/ctf-writer/field-types.c @@ -516,7 +516,7 @@ int add_structure_variant_member(GArray *members, if (is_variant) { struct bt_ctf_field_type_common_variant_choice *choice = - &g_array_index(members, + &bt_g_array_index(members, struct bt_ctf_field_type_common_variant_choice, members->len - 1); @@ -528,7 +528,7 @@ int add_structure_variant_member(GArray *members, BT_ASSERT_DBG(choice->ranges); } else { struct bt_ctf_field_type_common_structure_field *field = - &g_array_index(members, + &bt_g_array_index(members, struct bt_ctf_field_type_common_structure_field, members->len - 1); @@ -2190,7 +2190,7 @@ int64_t bt_ctf_field_type_common_variant_find_choice_index( for (range_i = 0; range_i < choice->ranges->len; range_i++) { struct bt_ctf_field_type_common_variant_choice_range *range = - &g_array_index( + &bt_g_array_index( choice->ranges, struct bt_ctf_field_type_common_variant_choice_range, range_i);