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

[babeltrace.git] / src / lib / graph / component-descriptor-set.c

diff --git a/src/lib/graph/component-descriptor-set.c b/src/lib/graph/component-descriptor-set.c
index 631157d363fa6dab6dd041b1b55b08f0b3630d8a..0ef243884ecc1c13e49839646989dc68c3498032 100644 (file)
--- a/src/lib/graph/component-descriptor-set.c
+++ b/src/lib/graph/component-descriptor-set.c
@@ -9,7 +9,7 @@
 #include "lib/logging.h"
 
 #include "common/assert.h"
-#include "lib/assert-pre.h"
+#include "lib/assert-cond.h"
 #include "compat/compiler.h"
 #include "common/common.h"
 #include <babeltrace2/types.h>
@@ -126,10 +126,9 @@ bt_component_descriptor_set_add_descriptor_with_initialize_method_data(
        GPtrArray *comp_descr_array = NULL;
 
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(comp_descr_set, "Component descriptor set");
-       BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
-       BT_ASSERT_PRE(!params || bt_value_is_map(params),
-               "Parameter value is not a map value: %!+v", params);
+       BT_ASSERT_PRE_COMP_DESCR_SET_NON_NULL(comp_descr_set);
+       BT_ASSERT_PRE_COMP_CLS_NON_NULL(comp_cls);
+       BT_ASSERT_PRE_PARAM_VALUE_IS_MAP(params);
        BT_LIB_LOGI("Adding component descriptor to set: "
                "set-addr=%p, %![cc-]+C, "
                "%![params-]+v, init-method-data-addr=%p",