X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=821f01cd409d2fa092346ed7b8a9454fb64eb27e;hp=83286a00213fc6df857d1573f01304a008a3290c;hb=94382e15b98b3af4ba6810dca2c40a8133325364;hpb=71a559f8ebee6ba681dfba864d6dace2efcf0440

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 83286a002..821f01cd4 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -1406,6 +1406,7 @@ int cmd_add_context(struct ltt_session *session, enum lttng_domain_type domain,
 			ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
 			goto error;
 		}
+		/* break is _not_ missing here. */
 	}
 	case LTTNG_DOMAIN_UST:
 	{
@@ -1790,7 +1791,9 @@ static int _cmd_enable_event(struct ltt_session *session,
 		filter_expression = NULL;
 		filter = NULL;
 		exclusion = NULL;
-		if (ret != LTTNG_OK && ret != LTTNG_ERR_UST_EVENT_ENABLED) {
+		if (ret == LTTNG_ERR_UST_EVENT_ENABLED) {
+			goto already_enabled;
+		} else if (ret != LTTNG_OK) {
 			goto error;
 		}
 		break;
@@ -1888,7 +1891,9 @@ static int _cmd_enable_event(struct ltt_session *session,
 					filter_copy, NULL, wpipe);
 		}
 
-		if (ret != LTTNG_OK && ret != LTTNG_ERR_UST_EVENT_ENABLED) {
+		if (ret == LTTNG_ERR_UST_EVENT_ENABLED) {
+			goto already_enabled;
+		} else if (ret != LTTNG_OK) {
 			goto error;
 		}
 
@@ -1915,6 +1920,7 @@ static int _cmd_enable_event(struct ltt_session *session,
 
 	ret = LTTNG_OK;
 
+already_enabled:
 error:
 	free(filter_expression);
 	free(filter);