From 2721f7ead09cdad18bf63d63da1104ea9495b76e Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
 <jeremie.galarneau@efficios.com>
Date: Thu, 3 May 2018 14:57:07 -0400
Subject: [PATCH] Clean-up: reduce indentation level of
 create_channel_per_uid()
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---
 src/bin/lttng-sessiond/ust-app.c | 75 ++++++++++++++++----------------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 62971067c..7da6f1aae 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -2858,7 +2858,6 @@ static int create_channel_per_uid(struct ust_app *app,
 	int ret;
 	struct buffer_reg_uid *reg_uid;
 	struct buffer_reg_channel *reg_chan;
-	bool created = false;
 
 	assert(app);
 	assert(usess);
@@ -2877,51 +2876,50 @@ static int create_channel_per_uid(struct ust_app *app,
 
 	reg_chan = buffer_reg_channel_find(ua_chan->tracing_channel_id,
 			reg_uid);
-	if (!reg_chan) {
-		/* Create the buffer registry channel object. */
-		ret = create_buffer_reg_channel(reg_uid->registry, ua_chan, &reg_chan);
-		if (ret < 0) {
-			ERR("Error creating the UST channel \"%s\" registry instance",
-				ua_chan->name);
-			goto error;
-		}
-		assert(reg_chan);
+	if (reg_chan) {
+		goto send_channel;
+	}
 
-		/*
-		 * Create the buffers on the consumer side. This call populates the
-		 * ust app channel object with all streams and data object.
-		 */
-		ret = do_consumer_create_channel(usess, ua_sess, ua_chan,
-				app->bits_per_long, reg_uid->registry->reg.ust);
-		if (ret < 0) {
-			ERR("Error creating UST channel \"%s\" on the consumer daemon",
+	/* Create the buffer registry channel object. */
+	ret = create_buffer_reg_channel(reg_uid->registry, ua_chan, &reg_chan);
+	if (ret < 0) {
+		ERR("Error creating the UST channel \"%s\" registry instance",
 				ua_chan->name);
+		goto error;
+	}
 
-			/*
-			 * Let's remove the previously created buffer registry channel so
-			 * it's not visible anymore in the session registry.
-			 */
-			ust_registry_channel_del_free(reg_uid->registry->reg.ust,
-					ua_chan->tracing_channel_id, false);
-			buffer_reg_channel_remove(reg_uid->registry, reg_chan);
-			buffer_reg_channel_destroy(reg_chan, LTTNG_DOMAIN_UST);
-			goto error;
-		}
+	/*
+	 * Create the buffers on the consumer side. This call populates the
+	 * ust app channel object with all streams and data object.
+	 */
+	ret = do_consumer_create_channel(usess, ua_sess, ua_chan,
+			app->bits_per_long, reg_uid->registry->reg.ust);
+	if (ret < 0) {
+		ERR("Error creating UST channel \"%s\" on the consumer daemon",
+				ua_chan->name);
 
 		/*
-		 * Setup the streams and add it to the session registry.
+		 * Let's remove the previously created buffer registry channel so
+		 * it's not visible anymore in the session registry.
 		 */
-		ret = setup_buffer_reg_channel(reg_uid->registry,
-				ua_chan, reg_chan, app);
-		if (ret < 0) {
-			ERR("Error setting up UST channel \"%s\"",
-				ua_chan->name);
-			goto error;
-		}
-		created = true;
+		ust_registry_channel_del_free(reg_uid->registry->reg.ust,
+				ua_chan->tracing_channel_id, false);
+		buffer_reg_channel_remove(reg_uid->registry, reg_chan);
+		buffer_reg_channel_destroy(reg_chan, LTTNG_DOMAIN_UST);
+		goto error;
+	}
+
+	/*
+	 * Setup the streams and add it to the session registry.
+	 */
+	ret = setup_buffer_reg_channel(reg_uid->registry,
+			ua_chan, reg_chan, app);
+	if (ret < 0) {
+		ERR("Error setting up UST channel \"%s\"", ua_chan->name);
+		goto error;
 	}
 
-	if (created) {
+	{
 		enum lttng_error_code cmd_ret;
 		struct ltt_session *session;
 		uint64_t chan_reg_key;
@@ -2956,6 +2954,7 @@ static int create_channel_per_uid(struct ust_app *app,
 		}
 	}
 
+send_channel:
 	/* Send buffers to the application. */
 	ret = send_channel_uid_to_ust(reg_chan, app, ua_sess, ua_chan);
 	if (ret < 0) {
-- 
2.34.1