X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fctf-ir%2Fevent.c;h=cb1d9c86ce4bfc9ca32b19767ed96194d92d884b;hb=149bc52e92f860f992d02ca19371ca8d8321f3df;hp=47eeed46202520f4753523ae7e54e49774622c31;hpb=2225de6b8f05fe96d5b85d02e82fb5bf82903f44;p=babeltrace.git

diff --git a/lib/ctf-ir/event.c b/lib/ctf-ir/event.c
index 47eeed46..cb1d9c86 100644
--- a/lib/ctf-ir/event.c
+++ b/lib/ctf-ir/event.c
@@ -284,8 +284,7 @@ struct bt_ctf_event_class *bt_ctf_event_get_class(struct bt_ctf_event *event)
 		goto end;
 	}
 
-	event_class = event ? bt_get(bt_ctf_event_borrow_event_class(event)) :
-		NULL;
+	event_class = bt_get(bt_ctf_event_borrow_event_class(event));
 end:
 	return event_class;
 }
@@ -868,14 +867,16 @@ int bt_ctf_event_validate(struct bt_ctf_event *event)
 	struct bt_ctf_stream_class *stream_class = NULL;
 
 	assert(event);
-	ret = bt_ctf_field_validate(event->event_header);
-	if (ret) {
-		BT_LOGD("Invalid event's header field: "
-			"event-addr=%p, event-class-name=\"%s\", "
-			"event-class-id=%" PRId64,
-			event, bt_ctf_event_class_get_name(event->event_class),
-			bt_ctf_event_class_get_id(event->event_class));
-		goto end;
+	if (event->event_header) {
+		ret = bt_ctf_field_validate(event->event_header);
+		if (ret) {
+			BT_LOGD("Invalid event's header field: "
+					"event-addr=%p, event-class-name=\"%s\", "
+					"event-class-id=%" PRId64,
+					event, bt_ctf_event_class_get_name(event->event_class),
+					bt_ctf_event_class_get_id(event->event_class));
+			goto end;
+		}
 	}
 
 	stream_class = bt_ctf_event_class_get_stream_class(event->event_class);