X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Flttng-utils%2Ftrace-ir-data-copy.c;h=78f611cb54515cdf85f1f2ffa619ec2c8345222e;hb=1fc491bde9c3d7da2ad06752aa9438a52bd19cd5;hp=36d8db9f739d117b0e241bd2960679bbd5618228;hpb=ebf8799677687e8769fdd6a46c49b84827663bda;p=deliverable%2Fbabeltrace.git

diff --git a/plugins/lttng-utils/trace-ir-data-copy.c b/plugins/lttng-utils/trace-ir-data-copy.c
index 36d8db9f7..78f611cb5 100644
--- a/plugins/lttng-utils/trace-ir-data-copy.c
+++ b/plugins/lttng-utils/trace-ir-data-copy.c
@@ -62,17 +62,12 @@ end:
 BT_HIDDEN
 void copy_stream_content(const bt_stream *in_stream, bt_stream *out_stream)
 {
-	const bt_trace *in_trace;
-	const bt_stream_class *in_stream_class;
 	const char *stream_name;
 	bt_stream_status status;
 
 	BT_LOGD("Copying content of stream: in-s-addr=%p, out-s-addr=%p",
 			in_stream, out_stream);
 
-	in_stream_class = bt_stream_borrow_class_const(in_stream);
-	in_trace = bt_stream_borrow_trace_const(in_stream);
-
 	stream_name = bt_stream_get_name(in_stream);
 	if (stream_name) {
 		status = bt_stream_set_name(out_stream, stream_name);
@@ -195,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);
@@ -208,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);