lib: add structure FC member and variant FC option objects

[babeltrace.git] / plugins / lttng-utils / trace-ir-data-copy.c

diff --git a/plugins/lttng-utils/trace-ir-data-copy.c b/plugins/lttng-utils/trace-ir-data-copy.c
index 0d69b4cfc0738c36424fa98d0590aa303772d548..78f611cb54515cdf85f1f2ffa619ec2c8345222e 100644 (file)
--- a/plugins/lttng-utils/trace-ir-data-copy.c
+++ b/plugins/lttng-utils/trace-ir-data-copy.c
@@ -190,7 +190,7 @@ void copy_field_content(const bt_field *in_field, bt_field *out_field)
                uint64_t i, nb_member_struct;
                const bt_field *in_member_field;
                bt_field *out_member_field;
-               const bt_field_class *in_field_class, *in_member_field_class;
+               const bt_field_class *in_field_class;
                const char *in_member_name;
 
                in_field_class = bt_field_borrow_class_const(in_field);
@@ -203,10 +203,13 @@ void copy_field_content(const bt_field *in_field, bt_field *out_field)
                 * the debug-info was added.
                 */
                for (i = 0; i < nb_member_struct; i++) {
-                       bt_field_class_structure_borrow_member_by_index_const(
-                                       in_field_class, i, &in_member_name,
-                                       &in_member_field_class);
+                       const bt_field_class_structure_member *member =
+                               bt_field_class_structure_borrow_member_by_index_const(
+                                       in_field_class, i);
 
+                       in_member_name =
+                               bt_field_class_structure_member_get_name(
+                                       member);
                        in_member_field =
                                bt_field_structure_borrow_member_field_by_name_const(
                                                in_field, in_member_name);