From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Tue, 27 Feb 2018 16:14:03 +0000 (+0100)
Subject: console: lxc_terminal_conf_free()
X-Git-Tag: lxc-3.0.0.beta1~5^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aed105d52a5a00f6a1f7194fa0d70eb1ca959c39;p=thirdparty%2Flxc.git

console: lxc_terminal_conf_free()

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

diff --git a/src/lxc/attach.c b/src/lxc/attach.c
index d5f7006b1..e389c5853 100644
--- a/src/lxc/attach.c
+++ b/src/lxc/attach.c
@@ -997,7 +997,7 @@ static int lxc_attach_pty(struct lxc_conf *conf, struct lxc_pty *pty)
 
 on_error:
 	lxc_terminal_delete(pty);
-	lxc_pty_conf_free(pty);
+	lxc_terminal_conf_free(pty);
 	return -1;
 }
 
@@ -1387,7 +1387,7 @@ int lxc_attach(const char *name, const char *lxcpath,
 
 		if (options->attach_flags & LXC_ATTACH_ALLOCATE_PTY) {
 			lxc_terminal_delete(&pty);
-			lxc_pty_conf_free(&pty);
+			lxc_terminal_conf_free(&pty);
 		}
 		lxc_proc_put_context_info(init_ctx);
 		return ret_parent;
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 27e646e2a..25da10683 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -3786,7 +3786,7 @@ void lxc_conf_free(struct lxc_conf *conf)
 		return;
 	if (current_config == conf)
 		current_config = NULL;
-	lxc_pty_conf_free(&conf->console);
+	lxc_terminal_conf_free(&conf->console);
 	free(conf->rootfs.mount);
 	free(conf->rootfs.bdev_type);
 	free(conf->rootfs.options);
diff --git a/src/lxc/console.c b/src/lxc/console.c
index ac16d1e26..b3e91226a 100644
--- a/src/lxc/console.c
+++ b/src/lxc/console.c
@@ -1146,7 +1146,7 @@ void lxc_terminal_init(struct lxc_pty *pty)
 	lxc_terminal_info_init(&pty->peerpty);
 }
 
-void lxc_pty_conf_free(struct lxc_pty *terminal)
+void lxc_terminal_conf_free(struct lxc_pty *terminal)
 {
 	free(terminal->log_path);
 	free(terminal->path);
diff --git a/src/lxc/console.h b/src/lxc/console.h
index a81e67db5..5893570fd 100644
--- a/src/lxc/console.h
+++ b/src/lxc/console.h
@@ -234,7 +234,7 @@ extern int lxc_terminal_io_cb(int fd, uint32_t events, void *data,
 
 extern int lxc_make_controlling_pty(int fd);
 extern int lxc_login_pty(int fd);
-extern void lxc_pty_conf_free(struct lxc_pty *console);
+extern void lxc_terminal_conf_free(struct lxc_pty *console);
 extern void lxc_terminal_info_init(struct lxc_pty_info *pty);
 extern void lxc_terminal_init(struct lxc_pty *pty);
 extern int lxc_pty_map_ids(struct lxc_conf *c, struct lxc_pty *pty);