From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Thu, 25 Feb 2021 08:55:22 +0000 (+0100)
Subject: commands: s/lxc_cmd_init()/lxc_server_init()/g
X-Git-Tag: lxc-5.0.0~267^2~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6834acfffbe8ed5f021533c9ccaafd07f62f3bed;p=thirdparty%2Flxc.git

commands: s/lxc_cmd_init()/lxc_server_init()/g

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

diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index 74095a3bb..79ecbe427 100644
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -2044,7 +2044,7 @@ static int lxc_cmd_accept(int fd, uint32_t events, void *data,
 	return ret;
 }
 
-int lxc_cmd_init(const char *name, const char *lxcpath, const char *suffix)
+int lxc_server_init(const char *name, const char *lxcpath, const char *suffix)
 {
 	__do_close int fd = -EBADF;
 	int ret;
diff --git a/src/lxc/commands.h b/src/lxc/commands.h
index 8d99d5e06..d65d5ee69 100644
--- a/src/lxc/commands.h
+++ b/src/lxc/commands.h
@@ -122,7 +122,7 @@ __hidden extern int lxc_cmd_serve_state_clients(const char *name, const char *lx
 struct lxc_epoll_descr;
 struct lxc_handler;
 
-__hidden extern int lxc_cmd_init(const char *name, const char *lxcpath, const char *suffix);
+__hidden extern int lxc_server_init(const char *name, const char *lxcpath, const char *suffix);
 __hidden extern int lxc_cmd_mainloop_add(const char *name, struct lxc_epoll_descr *descr,
 					 struct lxc_handler *handler);
 __hidden extern int lxc_try_cmd(const char *name, const char *lxcpath);
diff --git a/src/lxc/start.c b/src/lxc/start.c
index df2898f0a..70aaf30e0 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -715,7 +715,7 @@ struct lxc_handler *lxc_init_handler(struct lxc_handler *old,
 	}
 
 	if (handler->conf->reboot == REBOOT_NONE) {
-		handler->conf->maincmd_fd = lxc_cmd_init(name, lxcpath, "command");
+		handler->conf->maincmd_fd = lxc_server_init(name, lxcpath, "command");
 		if (handler->conf->maincmd_fd < 0) {
 			ERROR("Failed to set up command socket");
 			goto on_error;