From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Mon, 9 Mar 2015 16:35:30 +0000 (-0400)
Subject: Fix: CTF 1.8 mandates that event "fields" must be a structure
X-Git-Tag: v2.0.0-pre1~1321
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=d2127f80af8db787b4f55efe9493b7e2473d667a

Fix: CTF 1.8 mandates that event "fields" must be a structure

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

diff --git a/formats/ctf/ir/event.c b/formats/ctf/ir/event.c
index 2c1dad47..e51087ba 100644
--- a/formats/ctf/ir/event.c
+++ b/formats/ctf/ir/event.c
@@ -158,7 +158,8 @@ int bt_ctf_event_class_set_payload_type(struct bt_ctf_event_class *event_class,
 {
 	int ret = 0;
 
-	if (!event_class || !payload) {
+	if (!event_class || !payload ||
+		bt_ctf_field_type_get_type_id(payload) != CTF_TYPE_STRUCT) {
 		ret = -1;
 		goto end;
 	}
diff --git a/include/babeltrace/ctf-ir/event.h b/include/babeltrace/ctf-ir/event.h
index 83aa044a..102883d6 100644
--- a/include/babeltrace/ctf-ir/event.h
+++ b/include/babeltrace/ctf-ir/event.h
@@ -120,7 +120,7 @@ extern struct bt_ctf_field_type *bt_ctf_event_class_get_payload_type(
  * Set an event class' payload type.
  *
  * @param event_class Event class.
- * @param payload The payload's type.
+ * @param payload The payload's type (must be a structure).
  *
  * Returns 0 on success, a negative value on error.
  */