X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=ed878f9b1fe412bee5b87614f810a2cdb0419cbf;hb=911d15607d55b7e374ff6750bddf7e4b4f763593;hp=ac489fa2fa7f946a7c65a8b81d8f4572323ea16d;hpb=8404118c67ee01844e0bcee69d05c684689506b0;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index ac489fa2f..ed878f9b1 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -1497,6 +1497,9 @@ static int _cmd_enable_event(struct ltt_session *session,
 	assert(event);
 	assert(channel_name);
 
+	/* If we have a filter, we must have its filter expression */
+	assert(!(!!filter_expression ^ !!filter));
+
 	DBG("Enable event command for event \'%s\'", event->name);
 
 	ret = validate_event_name(event->name);
@@ -1726,7 +1729,7 @@ static int _cmd_enable_event(struct ltt_session *session,
 		if (!agt) {
 			agt = agent_create(domain->type);
 			if (!agt) {
-				ret = -LTTNG_ERR_NOMEM;
+				ret = LTTNG_ERR_NOMEM;
 				goto error;
 			}
 			agent_add(agt, usess->agents);
@@ -1738,7 +1741,7 @@ static int _cmd_enable_event(struct ltt_session *session,
 		uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
 		default_event_name = event_get_default_agent_ust_name(domain->type);
 		if (!default_event_name) {
-			ret = -LTTNG_ERR_FATAL;
+			ret = LTTNG_ERR_FATAL;
 			goto error;
 		}
 		strncpy(uevent.name, default_event_name, sizeof(uevent.name));
@@ -1776,6 +1779,7 @@ static int _cmd_enable_event(struct ltt_session *session,
 					sizeof(struct lttng_filter_bytecode)
 					+ filter->len);
 				if (!filter_copy) {
+					ret = LTTNG_ERR_NOMEM;
 					goto error;
 				}