X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-visitor-generate-io-struct.c;h=4b399613585ebb81b9aa49d25c23583690483003;hp=9c381c5fac8a673d23d8e3a4ca080051d2ddf209;hb=325392affbbb6aaf2caf13836e7ba7c0d29c90a3;hpb=f380e105704874a3b1fc065122ca286397e3f83c

diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
index 9c381c5f..4b399613 100644
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -1585,7 +1585,7 @@ struct declaration *ctf_type_specifier_list_visit(FILE *fd,
 }
 
 static
-int ctf_event_declaration_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_event *event, struct ctf_trace *trace)
+int ctf_event_declaration_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_event_declaration *event, struct ctf_trace *trace)
 {
 	int ret = 0;
 
@@ -1741,9 +1741,9 @@ int ctf_event_visit(FILE *fd, int depth, struct ctf_node *node,
 {
 	int ret = 0;
 	struct ctf_node *iter;
-	struct ctf_event *event;
+	struct ctf_event_declaration *event;
 
-	event = g_new0(struct ctf_event, 1);
+	event = g_new0(struct ctf_event_declaration, 1);
 	event->declaration_scope = new_declaration_scope(parent_declaration_scope);
 	event->loglevel = -1;
 	bt_list_for_each_entry(iter, &node->u.event.declaration_list, siblings) {
@@ -2143,11 +2143,6 @@ int ctf_trace_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace
 		fprintf(fd, "[error] %s: missing minor field in trace declaration\n", __func__);
 		goto error;
 	}
-	if (!CTF_TRACE_FIELD_IS_SET(trace, uuid)) {
-		ret = -EPERM;
-		fprintf(fd, "[error] %s: missing uuid field in trace declaration\n", __func__);
-		goto error;
-	}
 	if (!CTF_TRACE_FIELD_IS_SET(trace, byte_order)) {
 		ret = -EPERM;
 		fprintf(fd, "[error] %s: missing byte_order field in trace declaration\n", __func__);