console: lxc_terminal_free()

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

src/lxc/commands.c

@@ -757,7 +757,7 @@ static int lxc_cmd_console_callback(int fd, struct lxc_cmd_req *req,
 	ret = lxc_abstract_unix_send_fds(fd, &masterfd, 1, &rsp, sizeof(rsp));
 	if (ret < 0) {
 		ERROR("Failed to send tty to client");
-		lxc_console_free(handler->conf, fd);
+		lxc_terminal_free(handler->conf, fd);
 		goto out_close;
 	}
 
@@ -1080,7 +1080,7 @@ static void lxc_cmd_fd_cleanup(int fd, struct lxc_handler *handler,
 	struct lxc_state_client *client;
 	struct lxc_list *cur, *next;
 
-	lxc_console_free(handler->conf, fd);
+	lxc_terminal_free(handler->conf, fd);
 	lxc_mainloop_del_handler(descr, fd);
 	if (cmd != LXC_CMD_ADD_STATE_CLIENT) {
 		close(fd);

src/lxc/console.c

@@ -617,7 +617,7 @@ int lxc_terminal_allocate(struct lxc_conf *conf, int sockfd, int *ttyreq)
 	return masterfd;
 }
 
-void lxc_console_free(struct lxc_conf *conf, int fd)
+void lxc_terminal_free(struct lxc_conf *conf, int fd)
 {
 	int i;
 	struct lxc_tty_info *tty_info = &conf->tty_info;

src/lxc/console.h

@@ -101,15 +101,15 @@ extern int  lxc_console_create(struct lxc_conf *);
 extern void lxc_console_delete(struct lxc_pty *);
 
 /*
- * lxc_console_free: mark the console or a tty as unallocated, free any
+ * lxc_terminal_free: mark the console or a tty as unallocated, free any
  * resources allocated by lxc_terminal_allocate().
  *
  * @conf : the configuration of the container whose tty was closed
  * @fd   : the socket fd whose remote side was closed, which indicated
  *         the console or tty is no longer in use. this is used to match
  *         which console/tty is being freed.
  */
-extern void lxc_console_free(struct lxc_conf *conf, int fd);
+extern void lxc_terminal_free(struct lxc_conf *conf, int fd);
 
 /*
  * Register pty event handlers in an open mainloop