From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sun, 15 Mar 2020 14:52:30 +0000 (+0100)
Subject: tree-wide: s/lxc_fini()/lxc_end()/g
X-Git-Tag: lxc-4.0.0~29^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3295%2Fhead;p=thirdparty%2Flxc.git

tree-wide: s/lxc_fini()/lxc_end()/g

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

diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index 6e5638928..e74bd4ddc 100644
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -1135,7 +1135,7 @@ static void do_restore(struct lxc_container *c, int status_pipe, struct migrate_
 		ret = lxc_poll(c->name, handler);
 		if (ret)
 			lxc_abort(handler);
-		lxc_fini(handler);
+		lxc_end(handler);
 		_exit(ret);
 	}
 
@@ -1145,7 +1145,7 @@ out_fini_handler:
 	if (pipes[1] >= 0)
 		close(pipes[1]);
 
-	lxc_fini(handler);
+	lxc_end(handler);
 
 out:
 	if (status_pipe >= 0) {
diff --git a/src/lxc/start.c b/src/lxc/start.c
index 73d46ae39..c82fb8988 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -860,7 +860,7 @@ out_restore_sigmask:
 	return -1;
 }
 
-void lxc_fini(struct lxc_handler *handler)
+void lxc_end(struct lxc_handler *handler)
 {
 	int ret;
 	pid_t self;
@@ -2007,7 +2007,7 @@ __private_goto2:
 	detach_block_device(handler->conf);
 
 __private_goto3:
-	lxc_fini(handler);
+	lxc_end(handler);
 
 	return ret;
 
diff --git a/src/lxc/start.h b/src/lxc/start.h
index 2c3edd8c0..7e2371c74 100644
--- a/src/lxc/start.h
+++ b/src/lxc/start.h
@@ -150,7 +150,7 @@ extern struct lxc_handler *lxc_init_handler(const char *name,
 extern void lxc_zero_handler(struct lxc_handler *handler);
 extern void lxc_free_handler(struct lxc_handler *handler);
 extern int lxc_init(const char *name, struct lxc_handler *handler);
-extern void lxc_fini(struct lxc_handler *handler);
+extern void lxc_end(struct lxc_handler *handler);
 
 /* lxc_check_inherited: Check for any open file descriptors and close them if
  *                      requested.