Standardize `!ptr` i/o `ptr == NULL`, `ptr` i/o `ptr != NULL`

[babeltrace.git] / src / lib / graph / message / event.c

diff --git a/src/lib/graph/message/event.c b/src/lib/graph/message/event.c
index 5f3c90d4912a83bb6a9d67e8e0f6d77e211afcd0..4222a5a0a33d87b2ed646e433131fe3464fe4b4b 100644 (file)
--- a/src/lib/graph/message/event.c
+++ b/src/lib/graph/message/event.c
@@ -44,14 +44,13 @@
 
 #include "event.h"
 
-BT_ASSERT_PRE_FUNC
 static inline bool event_class_has_trace(struct bt_event_class *event_class)
 {
        struct bt_stream_class *stream_class;
 
        stream_class = bt_event_class_borrow_stream_class_inline(event_class);
        BT_ASSERT(stream_class);
-       return bt_stream_class_borrow_trace_class(stream_class) != NULL;
+       return bt_stream_class_borrow_trace_class(stream_class);
 }
 
 BT_HIDDEN
@@ -271,8 +270,8 @@ struct bt_event *borrow_event(struct bt_message *message)
 {
        struct bt_message_event *event_message;
 
-       BT_ASSERT_PRE_NON_NULL(message, "Message");
-       BT_ASSERT_PRE_MSG_IS_TYPE(message, BT_MESSAGE_TYPE_EVENT);
+       BT_ASSERT_PRE_DEV_NON_NULL(message, "Message");
+       BT_ASSERT_PRE_DEV_MSG_IS_TYPE(message, BT_MESSAGE_TYPE_EVENT);
        event_message = container_of(message,
                        struct bt_message_event, parent);
        return event_message->event;
@@ -297,12 +296,12 @@ bt_message_event_borrow_default_clock_snapshot_const(
        struct bt_message_event *event_msg = (void *) msg;
        struct bt_stream_class *stream_class;
 
-       BT_ASSERT_PRE_NON_NULL(msg, "Message");
-       BT_ASSERT_PRE_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_EVENT);
+       BT_ASSERT_PRE_DEV_NON_NULL(msg, "Message");
+       BT_ASSERT_PRE_DEV_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_EVENT);
        stream_class = bt_event_class_borrow_stream_class_inline(
                event_msg->event->class);
        BT_ASSERT(stream_class);
-       BT_ASSERT_PRE(stream_class->default_clock_class,
+       BT_ASSERT_PRE_DEV(stream_class->default_clock_class,
                "Message's stream's class has no default clock class: "
                "%![msg-]+n, %![sc-]+S", msg, stream_class);
        return event_msg->default_cs;
@@ -315,8 +314,8 @@ bt_message_event_borrow_stream_class_default_clock_class_const(
        struct bt_message_event *event_msg = (void *) msg;
        struct bt_stream_class *stream_class;
 
-       BT_ASSERT_PRE_NON_NULL(msg, "Message");
-       BT_ASSERT_PRE_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_EVENT);
+       BT_ASSERT_PRE_DEV_NON_NULL(msg, "Message");
+       BT_ASSERT_PRE_DEV_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_EVENT);
        stream_class = bt_event_class_borrow_stream_class_inline(
                event_msg->event->class);
        BT_ASSERT(stream_class);