X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fcurrent-thread.c;h=9e14e4e70e895920a852707ca98d5464e12cfece;hb=867eb7632255f6a84234542198bd7edaac1bce12;hp=457ca6f19871f6c50704cd01793155ea536036c8;hpb=d98421f2abfc5adab28ab7ee9b63537a6c7261cc;p=babeltrace.git

diff --git a/src/lib/current-thread.c b/src/lib/current-thread.c
index 457ca6f1..9e14e4e7 100644
--- a/src/lib/current-thread.c
+++ b/src/lib/current-thread.c
@@ -16,6 +16,12 @@
 #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.
@@ -42,7 +48,7 @@ void bt_current_thread_clear_error(void)
 
 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",
@@ -85,9 +91,9 @@ bt_current_thread_error_append_cause_from_unknown(
 		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;
@@ -113,9 +119,9 @@ bt_current_thread_error_append_cause_from_component(
 		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;
@@ -141,9 +147,9 @@ bt_current_thread_error_append_cause_from_component_class(
 		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;
@@ -169,9 +175,9 @@ bt_current_thread_error_append_cause_from_message_iterator(
 		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;