Fix: lib: add NULL check for destroy_listeners in destroy_component_class

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

diff --git a/src/lib/graph/message-iterator-class.c b/src/lib/graph/message-iterator-class.c
index c059862b9897d63c9a4541bed536a7ba2def8916..4322f4fe15c84cfaa88457cea0f5d880715be8bc 100644 (file)
--- a/src/lib/graph/message-iterator-class.c
+++ b/src/lib/graph/message-iterator-class.c
@@ -10,12 +10,13 @@
 #include "message-iterator-class.h"
 
 #include "compat/compiler.h"
-#include "lib/assert-pre.h"
+#include "lib/assert-cond.h"
 #include "lib/func-status.h"
 
-#define BT_ASSERT_PRE_DEV_MSG_ITER_CLS_HOT(_msg_iter_cls) \
-       BT_ASSERT_PRE_DEV_HOT((_msg_iter_cls), \
-               "Message iterator class", ": %!+I", (_msg_iter_cls))
+#define BT_ASSERT_PRE_DEV_MSG_ITER_CLS_HOT(_msg_iter_cls)              \
+       BT_ASSERT_PRE_DEV_HOT("message-iterator-class",                 \
+               (_msg_iter_cls), "Message iterator class",              \
+               ": %!+I", (_msg_iter_cls))
 
 BT_HIDDEN
 void _bt_message_iterator_class_freeze(
@@ -57,7 +58,7 @@ struct bt_message_iterator_class *bt_message_iterator_class_create(
        struct bt_message_iterator_class *message_iterator_class;
 
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(next_method, "Next method");
+       BT_ASSERT_PRE_NON_NULL("next-method", next_method, "Next method");
        BT_LOGI("Creating message iterator class: next-method-addr=%p",
                next_method);
 
@@ -82,8 +83,8 @@ bt_message_iterator_class_set_initialize_method(
        bt_message_iterator_class_initialize_method method)
 {
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(message_iterator_class, "Message iterator class");
-       BT_ASSERT_PRE_NON_NULL(method, "Method");
+       BT_ASSERT_PRE_MSG_ITER_CLS_NON_NULL(message_iterator_class);
+       BT_ASSERT_PRE_METHOD_NON_NULL(method);
        BT_ASSERT_PRE_DEV_MSG_ITER_CLS_HOT(message_iterator_class);
        message_iterator_class->methods.initialize = method;
        BT_LIB_LOGD("Set message iterator class's iterator initialization method"
@@ -97,8 +98,8 @@ bt_message_iterator_class_set_finalize_method(
                bt_message_iterator_class_finalize_method method)
 {
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(message_iterator_class, "Message iterator class");
-       BT_ASSERT_PRE_NON_NULL(method, "Method");
+       BT_ASSERT_PRE_MSG_ITER_CLS_NON_NULL(message_iterator_class);
+       BT_ASSERT_PRE_METHOD_NON_NULL(method);
        BT_ASSERT_PRE_DEV_MSG_ITER_CLS_HOT(message_iterator_class);
        message_iterator_class->methods.finalize = method;
        BT_LIB_LOGD("Set message iterator class's finalization method"
@@ -113,8 +114,8 @@ bt_message_iterator_class_set_seek_ns_from_origin_methods(
                bt_message_iterator_class_can_seek_ns_from_origin_method can_seek_method)
 {
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(message_iterator_class, "Message iterator class");
-       BT_ASSERT_PRE_NON_NULL(seek_method, "Seek method");
+       BT_ASSERT_PRE_MSG_ITER_CLS_NON_NULL(message_iterator_class);
+       BT_ASSERT_PRE_NON_NULL("seek-method", seek_method, "Seek method");
        BT_ASSERT_PRE_DEV_MSG_ITER_CLS_HOT(message_iterator_class);
        message_iterator_class->methods.seek_ns_from_origin = seek_method;
        message_iterator_class->methods.can_seek_ns_from_origin = can_seek_method;
@@ -130,12 +131,12 @@ bt_message_iterator_class_set_seek_beginning_methods(
                bt_message_iterator_class_can_seek_beginning_method can_seek_method)
 {
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(message_iterator_class, "Message iterator class");
-       BT_ASSERT_PRE_NON_NULL(seek_method, "Seek method");
+       BT_ASSERT_PRE_MSG_ITER_CLS_NON_NULL(message_iterator_class);
+       BT_ASSERT_PRE_NON_NULL("seek-method", seek_method, "Seek method");
        BT_ASSERT_PRE_DEV_MSG_ITER_CLS_HOT(message_iterator_class);
        message_iterator_class->methods.seek_beginning = seek_method;
        message_iterator_class->methods.can_seek_beginning = can_seek_method;
        BT_LIB_LOGD("Set message iterator class's \"seek beginning\" methods"
-               ": %!+C", message_iterator_class);
+               ": %!+I", message_iterator_class);
        return BT_FUNC_STATUS_OK;
 }