X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Fnotification.c;h=a5d887007baf52c41c5fb2bf06a9af010cf5c27c;hb=f03ea3f43450abb1a1ea704044e1e8c78cfc0b4c;hp=2c4e052b1d0d14c577594a964e4e4d08a4eba022;hpb=6bec8cb240a4afc220bfd21f4b5f3c7eb4958dc2;p=lttng-tools.git

diff --git a/src/common/notification.c b/src/common/notification.c
index 2c4e052b1..a5d887007 100644
--- a/src/common/notification.c
+++ b/src/common/notification.c
@@ -78,9 +78,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 +88,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 +105,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 +129,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 +146,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);
@@ -178,6 +179,24 @@ const struct lttng_evaluation *lttng_notification_get_evaluation(
 	return notification ? notification->evaluation : NULL;
 }
 
+const struct lttng_condition *lttng_notification_get_const_condition(
+		const struct lttng_notification *notification)
+{
+	return notification ? lttng_trigger_get_const_condition(notification->trigger) : NULL;
+}
+
+const struct lttng_evaluation *lttng_notification_get_const_evaluation(
+		const struct lttng_notification *notification)
+{
+	return notification ? notification->evaluation : NULL;
+}
+
+const struct lttng_trigger *lttng_notification_get_const_trigger(
+		const struct lttng_notification *notification)
+{
+	return notification ? notification->trigger : NULL;
+}
+
 const struct lttng_trigger *lttng_notification_get_trigger(
 		struct lttng_notification *notification)
 {