X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=a8c6c9b24adc33a3b13a14b2f206ffea5edc8230;hp=469fffa980f33b6c527d94ac47e6fb51a3ce6f42;hb=1bec5f09b2833828aec3c60188d68b2a116f1ee5;hpb=9f449915b9d44ce3c9c9255f5d491a62545fee25

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 469fffa98..a8c6c9b24 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -2047,14 +2047,14 @@ int lttng_calibrate(struct lttng_handle *handle,
 void lttng_channel_set_default_attr(struct lttng_domain *domain,
 		struct lttng_channel_attr *attr)
 {
-	struct lttng_channel_extended *extended =
-			(struct lttng_channel_extended *) attr->extended.ptr;
+	struct lttng_channel_extended *extended;
 
 	/* Safety check */
 	if (attr == NULL || domain == NULL) {
 		return;
 	}
 
+	extended = (struct lttng_channel_extended *) attr->extended.ptr;
 	memset(attr, 0, sizeof(struct lttng_channel_attr));
 
 	/* Same for all domains. */
@@ -2607,7 +2607,7 @@ int lttng_register_trigger(struct lttng_trigger *trigger)
 	}
 
 	if (!lttng_trigger_validate(trigger)) {
-		ret = -LTTNG_ERR_INVALID;
+		ret = -LTTNG_ERR_INVALID_TRIGGER;
 		goto end;
 	}