X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=b39b86906e506ffbbe8cc77619a9a90d01c0b5e6;hp=f078735c3ea9fd5307c46333b28b2c473867a7e1;hb=c87a8eb2082fb480f17c63e56ffab6cbc9257680;hpb=00f7fbf0bcce4662bf7e755ecee0517bfebf6ae2

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index f078735c..b39b8690 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -159,6 +159,7 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
 				id = integer_definition->value._unsigned;
 			}
 		}
+		stream->event_id = id;
 
 		/* lookup timestamp */
 		stream->has_timestamp = 0;
@@ -220,35 +221,13 @@ int ctf_write_event(struct stream_pos *pos, struct ctf_stream *stream)
 {
 	struct ctf_stream_class *stream_class = stream->stream_class;
 	struct ctf_stream_event *event;
-	uint64_t id = 0;
+	uint64_t id;
 	int ret;
 
+	id = stream->event_id;
+
 	/* print event header */
 	if (stream->stream_event_header) {
-		struct definition_integer *integer_definition;
-		struct definition *variant;
-
-		/* lookup event id */
-		integer_definition = lookup_integer(&stream->stream_event_header->p, "id", FALSE);
-		if (integer_definition) {
-			id = integer_definition->value._unsigned;
-		} else {
-			struct definition_enum *enum_definition;
-
-			enum_definition = lookup_enum(&stream->stream_event_header->p, "id", FALSE);
-			if (enum_definition) {
-				id = enum_definition->integer->value._unsigned;
-			}
-		}
-
-		variant = lookup_variant(&stream->stream_event_header->p, "v");
-		if (variant) {
-			integer_definition = lookup_integer(variant, "id", FALSE);
-			if (integer_definition) {
-				id = integer_definition->value._unsigned;
-			}
-		}
-
 		ret = generic_rw(pos, &stream->stream_event_header->p);
 		if (ret)
 			goto error;