src/lib/{current-thread,error}.c: put precond. assertion at right place

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Id43d7d881253cd00e9dec46770ba517fc22f0adf
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1660
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>

diff --git a/src/lib/current-thread.c b/src/lib/current-thread.c
index 959e1695140d8941b9a47e1fb28c7376680062a8..519507de5837cdfb98b6f972584d3293d86d5f0c 100644 (file)
--- a/src/lib/current-thread.c
+++ b/src/lib/current-thread.c
@@ -58,6 +58,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_current_thread_clear_error();
        thread_error = (void *) error;
        BT_LOGD("Moved error object as current thread's error: addr=%p",
@@ -100,6 +101,10 @@ 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");
+
        if (status) {
                goto end;
        }
@@ -124,6 +129,10 @@ 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");
+
        if (status) {
                goto end;
        }
@@ -148,6 +157,10 @@ 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");
+
        if (status) {
                goto end;
        }
@@ -172,6 +185,10 @@ 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");
+
        if (status) {
                goto end;
        }

diff --git a/src/lib/error.c b/src/lib/error.c
index b19fe1dab6f0e7ddf4f788abf40b91ffcb12d0ad..bb2c3ad607960cfb97b15ea0e0c626e02c1a9474 100644 (file)
--- a/src/lib/error.c
+++ b/src/lib/error.c
@@ -487,10 +487,10 @@ int bt_error_append_cause_from_unknown(struct bt_error *error,
        struct bt_error_cause *cause = NULL;
        int status = BT_FUNC_STATUS_OK;
 
-       BT_ASSERT_PRE_NON_NULL(error, "Error");
-       BT_ASSERT_PRE_NON_NULL(module_name, "Module name");
-       BT_ASSERT_PRE_NON_NULL(file_name, "Function name");
-       BT_ASSERT_PRE_NON_NULL(msg_fmt, "Message format string");
+       BT_ASSERT(error);
+       BT_ASSERT(module_name);
+       BT_ASSERT(file_name);
+       BT_ASSERT(msg_fmt);
        BT_LOGD("Appending error cause from unknown actor: "
                "module-name=\"%s\", func-name=\"%s\", line-no=%" PRIu64,
                module_name, file_name, line_no);
@@ -520,10 +520,10 @@ int bt_error_append_cause_from_component(
        struct bt_error_cause_component_actor *cause = NULL;
        int status = BT_FUNC_STATUS_OK;
 
-       BT_ASSERT_PRE_NON_NULL(error, "Error");
-       BT_ASSERT_PRE_NON_NULL(self_comp, "Component");
-       BT_ASSERT_PRE_NON_NULL(file_name, "Function name");
-       BT_ASSERT_PRE_NON_NULL(msg_fmt, "Message format string");
+       BT_ASSERT(error);
+       BT_ASSERT(self_comp);
+       BT_ASSERT(file_name);
+       BT_ASSERT(msg_fmt);
        BT_LIB_LOGD("Appending error cause from component actor: %![comp-]+c",
                self_comp);
        cause = create_error_cause_component_actor((void *) self_comp,
@@ -554,10 +554,10 @@ int bt_error_append_cause_from_component_class(
        struct bt_error_cause_component_class_actor *cause = NULL;
        int status = BT_FUNC_STATUS_OK;
 
-       BT_ASSERT_PRE_NON_NULL(error, "Error");
-       BT_ASSERT_PRE_NON_NULL(self_comp_class, "Component class");
-       BT_ASSERT_PRE_NON_NULL(file_name, "Function name");
-       BT_ASSERT_PRE_NON_NULL(msg_fmt, "Message format string");
+       BT_ASSERT(error);
+       BT_ASSERT(self_comp_class);
+       BT_ASSERT(file_name);
+       BT_ASSERT(msg_fmt);
        BT_LIB_LOGD("Appending error cause from component class actor: "
                "%![comp-cls-]+C", self_comp_class);
        cause = create_error_cause_component_class_actor(
@@ -587,10 +587,10 @@ int bt_error_append_cause_from_message_iterator(
        struct bt_error_cause_message_iterator_actor *cause = NULL;
        int status = BT_FUNC_STATUS_OK;
 
-       BT_ASSERT_PRE_NON_NULL(error, "Error");
-       BT_ASSERT_PRE_NON_NULL(self_iter, "Message iterator");
-       BT_ASSERT_PRE_NON_NULL(file_name, "Function name");
-       BT_ASSERT_PRE_NON_NULL(msg_fmt, "Message format string");
+       BT_ASSERT(error);
+       BT_ASSERT(self_iter);
+       BT_ASSERT(file_name);
+       BT_ASSERT(msg_fmt);
        BT_LIB_LOGD("Appending error cause from message iterator actor: "
                "%![comp-]+i", self_iter);
        cause = create_error_cause_message_iterator_actor(