]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
lxccontainer.c: rename enter_to_ns to enter_net_ns
authorSerge Hallyn <serge.hallyn@ubuntu.com>
Wed, 15 Oct 2014 09:55:51 +0000 (11:55 +0200)
committerStéphane Graber <stgraber@ubuntu.com>
Tue, 25 Nov 2014 21:57:23 +0000 (16:57 -0500)
because that's what it does

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
src/lxc/lxccontainer.c

index 2582da03b06764445fb0823c12ea526d6f95ea8d..eb3ea37409b48f440bfa8e1853c7d4497bc6bf35 100644 (file)
@@ -1460,7 +1460,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) {
        int netns, userns, ret = 0, init_pid = 0;;
        char new_netns_path[MAXPATHLEN];
        char new_userns_path[MAXPATHLEN];
@@ -1610,7 +1610,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;
                }
@@ -1700,7 +1700,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;
                }