X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=7d06c7a0cb41b8f3396e4460c92c25afbc501d8b;hb=a625e7d7209e5f3c854476d210b5a96557aa1896;hp=9a2160533ee909a5b5efb3c924d96b56484a99b0;hpb=f8a9654412d256e2330aea5e93b135443b62a807;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 9a2160533..7d06c7a0c 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -733,23 +733,13 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
 				sizeof(lsm.u.enable.channel_name));
 	}
 
-	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
-
-	/* figure out correct command type, based on if we have a filter or exclusions */
-	if (exclusion_count == 0) {
-		if (filter_expression == NULL) {
-			if (ev->name[0] != '\0') {
-				lsm.cmd_type = LTTNG_ENABLE_EVENT;
-			} else {
-				lsm.cmd_type = LTTNG_ENABLE_ALL_EVENT;
-			}
-		} else {
-			lsm.cmd_type = LTTNG_ENABLE_EVENT_WITH_FILTER;
-		}
+	if (ev->name[0] != '\0') {
+		lsm.cmd_type = LTTNG_ENABLE_EVENT;
 	} else {
-		lsm.cmd_type = LTTNG_ENABLE_EVENT_WITH_EXCLUSION;
+		lsm.cmd_type = LTTNG_ENABLE_ALL_EVENT;
 	}
 
+	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
 	memcpy(&lsm.u.enable.event, ev, sizeof(lsm.u.enable.event));
 
 	lttng_ctl_copy_string(lsm.session.name, handle->session_name,
@@ -869,9 +859,8 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
 	}
 
 	ret = lttng_ctl_ask_sessiond_varlen(&lsm, varlen_data,
-			LTTNG_SYMBOL_NAME_LEN * lsm.u.enable.exclusion_count
-					+ lsm.u.enable.bytecode_len,
-			NULL);
+			(LTTNG_SYMBOL_NAME_LEN * lsm.u.enable.exclusion_count) +
+			lsm.u.enable.bytecode_len, NULL);
 
 	if (lsm.u.enable.exclusion_count != 0) {
 		free(varlen_data);
@@ -1569,7 +1558,7 @@ int lttng_create_session_live(const char *name, const char *url,
 	lttng_ctl_copy_string(lsm.session.name, name, sizeof(lsm.session.name));
 
 	size = uri_parse_str_urls(url, NULL, &uris);
-	if (size < 0) {
+	if (size <= 0) {
 		ret = -LTTNG_ERR_INVALID;
 		goto end;
 	}