From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Thu, 30 Jul 2015 19:31:38 +0000 (-0400)
Subject: ir: empty structures are legal in CTF
X-Git-Tag: v2.0.0-pre1~1199
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=8c1aa858878b64d103166be4c02f110af87669df

ir: empty structures are legal in CTF

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/formats/ctf/ir/event-fields.c b/formats/ctf/ir/event-fields.c
index 829a4475..1092dc31 100644
--- a/formats/ctf/ir/event-fields.c
+++ b/formats/ctf/ir/event-fields.c
@@ -1257,7 +1257,7 @@ struct bt_ctf_field *bt_ctf_field_structure_create(
 		struct bt_ctf_field_structure, 1);
 	struct bt_ctf_field *field = NULL;
 
-	if (!structure || !structure_type->fields->len) {
+	if (!structure) {
 		goto end;
 	}
 
diff --git a/formats/ctf/ir/visitor.c b/formats/ctf/ir/visitor.c
index 62195b64..9b65ed58 100644
--- a/formats/ctf/ir/visitor.c
+++ b/formats/ctf/ir/visitor.c
@@ -273,10 +273,11 @@ int field_type_recursive_visit(struct bt_ctf_field_type *type,
 			ctf_type_stack_peek(context->stack);
 		int field_count = get_type_field_count(entry->type);
 
-		if (field_count <= 0) {
+		if (field_count <= 0 &&
+				!bt_ctf_field_type_is_structure(entry->type)) {
 			/*
 			 * Propagate error if one was given, else return
-			 * -1 since empty structures or variants are invalid
+			 * -1 since empty variants are invalid
 			 * at this point.
 			 */
 			ret = field_count < 0 ? field_count : -1;