Force usage of assert() condition when NDEBUG is defined

[lttng-tools.git] / src / common / notification.c

diff --git a/src/common/notification.c b/src/common/notification.c
index c640b9e7535fe78643a7602453b927523af33f6d..9c5bd6d18834465dbcf746cae11034e55dc2a50f 100644 (file)
--- a/src/common/notification.c
+++ b/src/common/notification.c
@@ -13,7 +13,6 @@
 #include <lttng/trigger/trigger-internal.h>
 #include <common/payload.h>
 #include <common/payload-view.h>
-#include <assert.h>
 
 LTTNG_HIDDEN
 struct lttng_notification *lttng_notification_create(
@@ -78,9 +77,9 @@ ssize_t lttng_notification_create_from_payload(
                struct lttng_payload_view *src_view,
                struct lttng_notification **notification)
 {
-       ssize_t ret, notification_size = 0, condition_size, evaluation_size;
-       struct lttng_trigger *trigger;
-       struct lttng_evaluation *evaluation;
+       ssize_t ret, notification_size = 0, trigger_size, evaluation_size;
+       struct lttng_trigger *trigger = NULL;
+       struct lttng_evaluation *evaluation = NULL;
        const struct lttng_notification_comm *notification_comm;
        const struct lttng_payload_view notification_comm_view =
                        lttng_payload_view_from_view(
@@ -88,13 +87,13 @@ ssize_t lttng_notification_create_from_payload(
 
        if (!src_view || !notification) {
                ret = -1;
-               goto end;
+               goto error;
        }
 
        if (!lttng_payload_view_is_valid(&notification_comm_view)) {
                /* Payload not large enough to contain the header. */
                ret = -1;
-               goto end;
+               goto error;
        }
 
        notification_comm = (typeof(notification_comm)) notification_comm_view.buffer.data;
@@ -105,16 +104,16 @@ ssize_t lttng_notification_create_from_payload(
                                lttng_payload_view_from_view(src_view,
                                                notification_size, -1);
 
-               condition_size = lttng_trigger_create_from_payload(
+               trigger_size = lttng_trigger_create_from_payload(
                                &condition_view, &trigger);
        }
 
-       if (condition_size < 0) {
-               ret = condition_size;
-               goto end;
+       if (trigger_size < 0) {
+               ret = trigger_size;
+               goto error;
        }
 
-       notification_size += condition_size;
+       notification_size += trigger_size;
 
        {
                /* struct lttng_evaluation */
@@ -129,14 +128,14 @@ ssize_t lttng_notification_create_from_payload(
 
        if (evaluation_size < 0) {
                ret = evaluation_size;
-               goto end;
+               goto error;
        }
 
        notification_size += evaluation_size;
 
        /* Unexpected size of inner-elements; the buffer is corrupted. */
        if ((ssize_t) notification_comm->length !=
-                       condition_size + evaluation_size) {
+                       trigger_size + evaluation_size) {
                ret = -1;
                goto error;
        }
@@ -146,9 +145,10 @@ ssize_t lttng_notification_create_from_payload(
                ret = -1;
                goto error;
        }
+
        ret = notification_size;
-end:
        return ret;
+
 error:
        lttng_trigger_destroy(trigger);
        lttng_evaluation_destroy(evaluation);
@@ -177,3 +177,9 @@ const struct lttng_evaluation *lttng_notification_get_evaluation(
 {
        return notification ? notification->evaluation : NULL;
 }
+
+const struct lttng_trigger *lttng_notification_get_trigger(
+               struct lttng_notification *notification)
+{
+       return notification ? notification->trigger : NULL;
+}