lib: use common precond. assert. macros from `assert-cond.h` thru lib

[babeltrace.git] / src / lib / graph / message / message-iterator-inactivity.c

diff --git a/src/lib/graph/message/message-iterator-inactivity.c b/src/lib/graph/message/message-iterator-inactivity.c
index 9303c650256ddf756693c73a5cbe8d6221602798..f6769aff52edba063d0ecaecf6b6e83f8f7512ac 100644 (file)
--- a/src/lib/graph/message/message-iterator-inactivity.c
+++ b/src/lib/graph/message/message-iterator-inactivity.c
@@ -7,7 +7,7 @@
 #define BT_LOG_TAG "LIB/MSG-MSG-ITER-INACTIVITY"
 #include "lib/logging.h"
 
-#include "lib/assert-pre.h"
+#include "lib/assert-cond.h"
 #include "lib/object.h"
 #include "compat/compiler.h"
 #include <babeltrace2/trace-ir/clock-class.h>
@@ -45,8 +45,8 @@ struct bt_message *bt_message_message_iterator_inactivity_create(
        struct bt_message *ret_msg = NULL;
 
        BT_ASSERT_PRE_DEV_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(msg_iter, "Message iterator");
-       BT_ASSERT_PRE_NON_NULL(clock_class, "Default clock class");
+       BT_ASSERT_PRE_MSG_ITER_NON_NULL(msg_iter);
+       BT_ASSERT_PRE_DEF_CLK_CLS_NON_NULL(clock_class);
        BT_LIB_LOGD("Creating message iterator inactivity message object: "
                "%![iter-]+i, %![cc-]+K, value=%" PRIu64, msg_iter,
                clock_class, value_cycles);
@@ -85,8 +85,8 @@ bt_message_message_iterator_inactivity_borrow_clock_snapshot_const(
 {
        struct bt_message_message_iterator_inactivity *inactivity = (void *) msg;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(msg, "Message");
-       BT_ASSERT_PRE_DEV_MSG_IS_TYPE(msg,
+       BT_ASSERT_PRE_DEV_MSG_NON_NULL(msg);
+       BT_ASSERT_PRE_DEV_MSG_HAS_TYPE(msg,
                BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY);
        return inactivity->cs;
 }