tree-wide: s/steal_fd/move_fd/g

Suggested-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index f4304e6404256f358b26e0217de42977b9dcf7bf..ad2c578e14944dcd85d7825911c7ce7e53dbadbf 100644 (file)
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -245,7 +245,7 @@ static int lxc_cmd_send(const char *name, struct lxc_cmd_rr *cmd,
                return -1;
 
        if (cmd->req.datalen <= 0)
-               return steal_fd(client_fd);
+               return move_fd(client_fd);
 
        errno = EMSGSIZE;
        ret = lxc_send_nointr(client_fd, (void *)cmd->req.data,
@@ -253,7 +253,7 @@ static int lxc_cmd_send(const char *name, struct lxc_cmd_rr *cmd,
        if (ret < 0 || ret != (ssize_t)cmd->req.datalen)
                return -1;
 
-       return steal_fd(client_fd);
+       return move_fd(client_fd);
 }
 
 /*
@@ -304,7 +304,7 @@ static int lxc_cmd(const char *name, struct lxc_cmd_rr *cmd, int *stopped,
                *stopped = 1;
 
        if (stay_connected && ret > 0)
-               cmd->rsp.ret = steal_fd(client_fd);
+               cmd->rsp.ret = move_fd(client_fd);
 
        return ret;
 }
@@ -866,7 +866,7 @@ int lxc_cmd_add_state_client(const char *name, const char *lxcpath,
                return state;
        }
 
-       *state_client_fd = steal_fd(clientfd);
+       *state_client_fd = move_fd(clientfd);
        TRACE("Added state client %d to state client list", *state_client_fd);
        return MAX_STATE;
 }
@@ -1184,7 +1184,7 @@ static int lxc_cmd_accept(int fd, uint32_t events, void *data,
                return ret;
        }
 
-       steal_fd(connection);
+       move_fd(connection);
        return ret;
 }
 
@@ -1214,7 +1214,7 @@ int lxc_cmd_init(const char *name, const char *lxcpath, const char *suffix)
        }
 
        TRACE("Created abstract unix socket \"%s\"", &path[1]);
-       return steal_fd(fd);
+       return move_fd(fd);
 }
 
 int lxc_cmd_mainloop_add(const char *name, struct lxc_epoll_descr *descr,
@@ -1229,6 +1229,6 @@ int lxc_cmd_mainloop_add(const char *name, struct lxc_epoll_descr *descr,
                return ret;
        }
 
-       steal_fd(fd);
+       move_fd(fd);
        return ret;
 }

diff --git a/src/lxc/file_utils.c b/src/lxc/file_utils.c
index f7581eeeb8b07fd5e2729d12dc5471144b292534..f80aa642190aa988a3dbb4c6057af34f3c9bb6af 100644 (file)
--- a/src/lxc/file_utils.c
+++ b/src/lxc/file_utils.c
@@ -234,13 +234,13 @@ int lxc_make_tmpfile(char *template, bool rm)
                return -1;
 
        if (!rm)
-               return steal_fd(fd);
+               return move_fd(fd);
 
        ret = unlink(template);
        if (ret < 0)
                return -1;
 
-       return steal_fd(fd);
+       return move_fd(fd);
 }
 
 bool is_fs_type(const struct statfs *fs, fs_type_magic magic_val)

diff --git a/src/lxc/macro.h b/src/lxc/macro.h
index 3817ab5260c41f50c3c99faec6a8e0359f6c3957..6e07516f20abdcba4d3fb100bea82f09bca66613 100644 (file)
--- a/src/lxc/macro.h
+++ b/src/lxc/macro.h
@@ -400,11 +400,11 @@ enum {
                __internal_ptr__;                     \
        })
 
-#define steal_fd(fd)             \
-       ({                       \
-               int _fd_ = (fd); \
-               (fd) = -EBADF;   \
-               _fd_;            \
+#define move_fd(fd)                         \
+       ({                                  \
+               int __internal_fd__ = (fd); \
+               (fd) = -EBADF;              \
+               __internal_fd__;            \
        })
 
 #endif /* __LXC_MACRO_H */