tree-wide: s/steal_ptr/move_ptr/g

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

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 971c6a5237601dd587b798c0e2410994bcebb6b3..76d4dfe6d1700095f33a4e56904be90368ad0a68 100644 (file)
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -1451,7 +1451,7 @@ __cgfsng_ops static inline bool cgfsng_payload_create(struct cgroup_ops *ops,
                return false;
 
        INFO("The container process uses \"%s\" as cgroup", container_cgroup);
-       ops->container_cgroup = steal_ptr(container_cgroup);
+       ops->container_cgroup = move_ptr(container_cgroup);
        return true;
 }
 

diff --git a/src/lxc/macro.h b/src/lxc/macro.h
index 61e626f2ef59b8b9081df2b1b52025aaa2c1e678..3817ab5260c41f50c3c99faec6a8e0359f6c3957 100644 (file)
--- a/src/lxc/macro.h
+++ b/src/lxc/macro.h
@@ -393,11 +393,11 @@ enum {
 /* Maximum number of bytes sendfile() is able to send in one go. */
 #define LXC_SENDFILE_MAX 0x7ffff000
 
-#define steal_ptr(ptr)                     \
-       ({                                 \
-               typeof(ptr) _ptr_ = (ptr); \
-               (ptr) = NULL;              \
-               _ptr_;                     \
+#define move_ptr(ptr)                                 \
+       ({                                            \
+               typeof(ptr) __internal_ptr__ = (ptr); \
+               (ptr) = NULL;                         \
+               __internal_ptr__;                     \
        })
 
 #define steal_fd(fd)             \

diff --git a/src/lxc/rexec.c b/src/lxc/rexec.c
index 2258baae0c84159244a1f9d31aea1a74d48e0d44..58f3ff48618c98c5c77a9d1a1c9d2ab3735dd52e 100644 (file)
--- a/src/lxc/rexec.c
+++ b/src/lxc/rexec.c
@@ -77,7 +77,7 @@ static int parse_argv(char ***argv)
        if (ret <= 0)
                return -1;
 
-       steal_ptr(cmdline);
+       move_ptr(cmdline);
        return 0;
 }