From e4edf5d7bcee31ee159d6943c741d7ef06814b66 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Mon, 18 Feb 2019 22:12:29 +0100 Subject: [PATCH] tree-wide: s/steal_ptr/move_ptr/g Suggested-by: Wolfgang Bumiller Signed-off-by: Christian Brauner --- src/lxc/cgroups/cgfsng.c | 2 +- src/lxc/macro.h | 10 +++++----- src/lxc/rexec.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c index 971c6a523..76d4dfe6d 100644 --- 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 61e626f2e..3817ab526 100644 --- 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 2258baae0..58f3ff486 100644 --- 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; } -- 2.39.2