X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Ftrace.c;h=495df226999baf28af3aa348dd10419ce2f82cb1;hb=662e778c1c251b8ab256f572913b12b819679d32;hp=a886b69afd6526b60e4e3be869219f0e7cbfd37f;hpb=5d161ecc2079b67e0350715dc531ea684257a8ae;p=babeltrace.git

diff --git a/formats/ctf/ir/trace.c b/formats/ctf/ir/trace.c
index a886b69a..495df226 100644
--- a/formats/ctf/ir/trace.c
+++ b/formats/ctf/ir/trace.c
@@ -467,9 +467,6 @@ int bt_ctf_trace_set_byte_order(struct bt_ctf_trace *trace,
 	}
 
 	trace->byte_order = internal_byte_order;
-	if (trace->packet_header_type) {
-		init_trace_packet_header(trace);
-	}
 end:
 	return ret;
 }
@@ -585,17 +582,18 @@ int init_trace_packet_header(struct bt_ctf_trace *trace)
 		goto end;
 	}
 
-	bt_ctf_field_type_put(trace->packet_header_type);
-	trace->packet_header_type = trace_packet_header_type;
+	ret = bt_ctf_trace_set_packet_header_type(trace,
+		trace_packet_header_type);
+	if (ret) {
+		goto end;
+	}
 end:
 	bt_ctf_field_type_put(uuid_array_type);
 	bt_ctf_field_type_put(_uint32_t);
 	bt_ctf_field_type_put(_uint8_t);
 	bt_ctf_field_put(magic);
 	bt_ctf_field_put(uuid_array);
-	if (ret) {
-		bt_ctf_field_type_put(trace_packet_header_type);
-	}
+	bt_ctf_field_type_put(trace_packet_header_type);
 
 	return ret;
 }