From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 28 Feb 2018 11:12:59 +0000 (+0100)
Subject: terminal: lxc_terminal_allocate()
X-Git-Tag: lxc-3.0.0.beta1~4^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12c2eaaa0aaa55f448542e29ee492949b54dec09;p=thirdparty%2Flxc.git

terminal: lxc_terminal_allocate()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c
index 1aad822a5..a0d3144c5 100644
--- a/src/lxc/terminal.c
+++ b/src/lxc/terminal.c
@@ -600,13 +600,18 @@ on_error:
 
 int lxc_terminal_allocate(struct lxc_conf *conf, int sockfd, int *ttyreq)
 {
-	int masterfd = -1, ttynum;
+	int ttynum;
+	int masterfd = -1;
 	struct lxc_tty_info *ttys = &conf->ttys;
 	struct lxc_terminal *terminal = &conf->console;
 
 	if (*ttyreq == 0) {
-		if (lxc_terminal_peer_proxy_alloc(terminal, sockfd) < 0)
+		int ret;
+
+		ret = lxc_terminal_peer_proxy_alloc(terminal, sockfd);
+		if (ret < 0)
 			goto out;
+
 		masterfd = terminal->proxy.master;
 		goto out;
 	}
@@ -618,16 +623,17 @@ int lxc_terminal_allocate(struct lxc_conf *conf, int sockfd, int *ttyreq)
 		if (ttys->tty[*ttyreq - 1].busy)
 			goto out;
 
-		/* the requested tty is available */
+		/* The requested tty is available. */
 		ttynum = *ttyreq;
 		goto out_tty;
 	}
 
-	/* search for next available tty, fixup index tty1 => [0] */
-	for (ttynum = 1; ttynum <= ttys->nbtty && ttys->tty[ttynum - 1].busy; ttynum++)
+	/* Search for next available tty, fixup index tty1 => [0]. */
+	for (ttynum = 1; ttynum <= ttys->nbtty && ttys->tty[ttynum - 1].busy; ttynum++) {
 		;
+	}
 
-	/* we didn't find any available slot for tty */
+	/* We didn't find any available slot for tty. */
 	if (ttynum > ttys->nbtty)
 		goto out;
 
@@ -636,6 +642,7 @@ int lxc_terminal_allocate(struct lxc_conf *conf, int sockfd, int *ttyreq)
 out_tty:
 	ttys->tty[ttynum - 1].busy = sockfd;
 	masterfd = ttys->tty[ttynum - 1].master;
+
 out:
 	return masterfd;
 }