X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fgraph%2Fnotification-internal.h;h=5b7ce5397c712e56046946c4308109e4d3e772a6;hb=6c677fb54f458456e3b5a15cffa6774bd7a86f54;hp=243aac09cb1ffdfa40a8adf611060fe21128d56f;hpb=3fea54f69edd1780566230255da196cb6e82df62;p=babeltrace.git

diff --git a/include/babeltrace/graph/notification-internal.h b/include/babeltrace/graph/notification-internal.h
index 243aac09..5b7ce539 100644
--- a/include/babeltrace/graph/notification-internal.h
+++ b/include/babeltrace/graph/notification-internal.h
@@ -29,6 +29,7 @@
 
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/object-internal.h>
+#include <babeltrace/assert-internal.h>
 #include <babeltrace/graph/graph.h>
 #include <babeltrace/graph/notification.h>
 #include <babeltrace/ctf-ir/stream.h>
@@ -77,7 +78,7 @@ struct bt_notification *bt_notification_create_from_pool(
 {
 	struct bt_notification *notif = bt_object_pool_create_object(pool);
 
-	if (!notif) {
+	if (unlikely(!notif)) {
 #ifdef BT_LIB_LOGE
 		BT_LIB_LOGE("Cannot allocate one notification from notification pool: "
 			"%![pool-]+o, %![graph-]+g", pool, graph);
@@ -85,14 +86,14 @@ struct bt_notification *bt_notification_create_from_pool(
 		goto error;
 	}
 
-	if (!notif->graph) {
+	if (likely(!notif->graph)) {
 		notif->graph = graph;
 	}
 
 	goto end;
 
 error:
-	BT_PUT(notif);
+	BT_ASSERT(!notif);
 
 end:
 	return notif;