X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fmessage%2Fevent.c;h=57f8c42999c74b2aeb5ee94f3529c082df24250e;hb=c2d9d9cf280189e77453e82e4979c307eef111e7;hp=00b428c203f9f52e268a4d60657e74d73d77675d;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d;p=babeltrace.git

diff --git a/src/lib/graph/message/event.c b/src/lib/graph/message/event.c
index 00b428c2..57f8c429 100644
--- a/src/lib/graph/message/event.c
+++ b/src/lib/graph/message/event.c
@@ -21,8 +21,8 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "MSG-EVENT"
-#include "lib/lib-logging.h"
+#define BT_LOG_TAG "LIB/MSG-EVENT"
+#include "lib/logging.h"
 
 #include "common/assert.h"
 #include "lib/assert-pre.h"
@@ -108,7 +108,7 @@ struct bt_message *create_event_message(
 		event_class, stream_class, with_cs, raw_value);
 	BT_LIB_LOGD("Creating event message object: %![ec-]+E", event_class);
 	event = bt_event_create(event_class, packet);
-	if (unlikely(!event)) {
+	if (G_UNLIKELY(!event)) {
 		BT_LIB_LOGE("Cannot create event from event class: "
 			"%![ec-]+E", event_class);
 		goto error;
@@ -131,7 +131,7 @@ struct bt_message *create_event_message(
 	 */
 	message = (void *) bt_message_create_from_pool(
 		&msg_iter->graph->event_msg_pool, msg_iter->graph);
-	if (unlikely(!message)) {
+	if (G_UNLIKELY(!message)) {
 		/* bt_message_create_from_pool() logs errors */
 		goto error;
 	}
@@ -210,7 +210,7 @@ void bt_message_event_recycle(struct bt_message *msg)
 
 	BT_ASSERT(event_msg);
 
-	if (unlikely(!msg->graph)) {
+	if (G_UNLIKELY(!msg->graph)) {
 		bt_message_event_destroy(msg);
 		return;
 	}