From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 16 Dec 2022 14:47:46 +0000 (+0100)
Subject: channel: Rename the pointer to object 'objPtr' instead of 'obj'
X-Git-Tag: rec-5.0.0-alpha1~161^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6abb8aecb68fd7dad657ffd486a4ba7574e3539;p=thirdparty%2Fpdns.git

channel: Rename the pointer to object 'objPtr' instead of 'obj'
---

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<std::unique_ptr<T, D>> 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<T, D>(obj, deleter);
+        return std::unique_ptr<T, D>(objPtr, deleter);
       }
       else if (got == 0) {
         d_closed = true;