From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Wed, 15 Oct 2014 09:55:51 +0000 (+0200)
Subject: lxccontainer.c: rename enter_to_ns to enter_net_ns
X-Git-Tag: lxc-1.1.0.alpha3~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0f591898458167ac110aab5b4cabb892e673083;p=thirdparty%2Flxc.git

lxccontainer.c: rename enter_to_ns to enter_net_ns

because that's what it does

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 6b854338b..8cafdae50 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -1477,7 +1477,7 @@ static bool lxcapi_clear_config_item(struct lxc_container *c, const char *key)
 	return ret == 0;
 }
 
-static inline bool enter_to_ns(struct lxc_container *c)
+static inline bool enter_net_ns(struct lxc_container *c)
 {
 	pid_t pid = c->init_pid(c);
 
@@ -1586,7 +1586,7 @@ static char** lxcapi_get_interfaces(struct lxc_container *c)
 		/* close the read-end of the pipe */
 		close(pipefd[0]);
 
-		if (!enter_to_ns(c)) {
+		if (!enter_net_ns(c)) {
 			SYSERROR("failed to enter namespace");
 			goto out;
 		}
@@ -1676,7 +1676,7 @@ static char** lxcapi_get_ips(struct lxc_container *c, const char* interface, con
 		/* close the read-end of the pipe */
 		close(pipefd[0]);
 
-		if (!enter_to_ns(c)) {
+		if (!enter_net_ns(c)) {
 			SYSERROR("failed to enter namespace");
 			goto out;
 		}
@@ -3489,7 +3489,7 @@ static bool lxcapi_detach_interface(struct lxc_container *c, const char *ifname,
 
 	if (pid == 0) { // child
 		int ret = 0;
-		if (!enter_to_ns(c)) {
+		if (!enter_net_ns(c)) {
 			ERROR("failed to enter namespace");
 			exit(-1);
 		}