#include "lib/assert-cond.h"
#include "lib/func-status.h"
+#define BT_ASSERT_PRE_FILE_NAME_NON_NULL(_file_name) \
+ BT_ASSERT_PRE_NON_NULL("file-name", (_file_name), "File name");
+
+#define BT_ASSERT_PRE_MSG_FMT_NON_NULL(_msg_fmt) \
+ BT_ASSERT_PRE_NON_NULL("message-format", (_msg_fmt), "Message format");
+
/*
* This points to the thread's error object, or it's `NULL` if there's
* no current error object.
void bt_current_thread_move_error(const struct bt_error *error)
{
- BT_ASSERT_PRE_NON_NULL(error, "Error");
+ BT_ASSERT_PRE_ERROR_NON_NULL(error);
bt_current_thread_clear_error();
thread_error = (void *) error;
BT_LOGD("Moved error object as current thread's error: addr=%p",
try_create_thread_error();
va_list args;
- BT_ASSERT_PRE_NON_NULL(module_name, "Module name");
- BT_ASSERT_PRE_NON_NULL(file_name, "File name");
- BT_ASSERT_PRE_NON_NULL(msg_fmt, "Message format string");
+ BT_ASSERT_PRE_NON_NULL("module-name", module_name, "Module name");
+ BT_ASSERT_PRE_FILE_NAME_NON_NULL(file_name);
+ BT_ASSERT_PRE_MSG_FMT_NON_NULL(msg_fmt);
if (status) {
goto end;
try_create_thread_error();
va_list args;
- BT_ASSERT_PRE_NON_NULL(self_comp, "Component");
- BT_ASSERT_PRE_NON_NULL(file_name, "File name");
- BT_ASSERT_PRE_NON_NULL(msg_fmt, "Message format string");
+ BT_ASSERT_PRE_COMP_NON_NULL(self_comp);
+ BT_ASSERT_PRE_FILE_NAME_NON_NULL(file_name);
+ BT_ASSERT_PRE_MSG_FMT_NON_NULL(msg_fmt);
if (status) {
goto end;
try_create_thread_error();
va_list args;
- BT_ASSERT_PRE_NON_NULL(self_comp_class, "Component class");
- BT_ASSERT_PRE_NON_NULL(file_name, "File name");
- BT_ASSERT_PRE_NON_NULL(msg_fmt, "Message format string");
+ BT_ASSERT_PRE_COMP_CLS_NON_NULL(self_comp_class);
+ BT_ASSERT_PRE_FILE_NAME_NON_NULL(file_name);
+ BT_ASSERT_PRE_MSG_FMT_NON_NULL(msg_fmt);
if (status) {
goto end;
try_create_thread_error();
va_list args;
- BT_ASSERT_PRE_NON_NULL(self_iter, "Message iterator");
- BT_ASSERT_PRE_NON_NULL(file_name, "File name");
- BT_ASSERT_PRE_NON_NULL(msg_fmt, "Message format string");
+ BT_ASSERT_PRE_MSG_ITER_NON_NULL(self_iter);
+ BT_ASSERT_PRE_FILE_NAME_NON_NULL(file_name);
+ BT_ASSERT_PRE_MSG_FMT_NON_NULL(msg_fmt);
if (status) {
goto end;