From f6abb8aecb68fd7dad657ffd486a4ba7574e3539 Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Fri, 16 Dec 2022 15:47:46 +0100 Subject: [PATCH] channel: Rename the pointer to object 'objPtr' instead of 'obj' --- pdns/channel.hh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pdns/channel.hh b/pdns/channel.hh index 9334f3b64d..6d26dc1b6a 100644 --- a/pdns/channel.hh +++ b/pdns/channel.hh @@ -271,13 +271,13 @@ namespace channel { while (true) { std::optional> result; - T* obj{nullptr}; - ssize_t got = read(d_fd.getHandle(), &obj, sizeof(obj)); - if (got == sizeof(obj)) { + T* objPtr{nullptr}; + ssize_t got = read(d_fd.getHandle(), &objPtr, sizeof(objPtr)); + if (got == sizeof(objPtr)) { #if __SANITIZE_THREAD__ - __tsan_acquire(obj); + __tsan_acquire(objPtr); #endif /* __SANITIZE_THREAD__ */ - return std::unique_ptr(obj, deleter); + return std::unique_ptr(objPtr, deleter); } else if (got == 0) { d_closed = true; -- 2.47.2