From: Alex Richardson <arichardson.kde@gmail.com>
Date: Sun, 15 May 2022 10:34:48 +0000 (+0100)
Subject: dir-watch-kqueue: Silence -Wshadow warning
X-Git-Tag: dbus-1.15.0~60^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2480181af4ef0cae65aab303e103b58d8f6f2066;p=thirdparty%2Fdbus.git

dir-watch-kqueue: Silence -Wshadow warning

This should be the last warning that is preventing us from using -Werror
for FreeBSD builds.
---

diff --git a/bus/dir-watch-kqueue.c b/bus/dir-watch-kqueue.c
index 15519fcb5..a4ed7ca58 100644
--- a/bus/dir-watch-kqueue.c
+++ b/bus/dir-watch-kqueue.c
@@ -51,7 +51,7 @@ static DBusWatch *watch = NULL;
 static DBusLoop *loop = NULL;
 
 static dbus_bool_t
-_handle_kqueue_watch (DBusWatch *watch, unsigned int flags, void *data)
+_handle_kqueue_watch (DBusWatch *_watch, unsigned int flags, void *data)
 {
   struct kevent ev;
   struct timespec nullts = { 0, 0 };
@@ -73,6 +73,7 @@ _handle_kqueue_watch (DBusWatch *watch, unsigned int flags, void *data)
   else if (res < 0 && errno == EBADF)
     {
       kq = -1;
+      _dbus_assert (watch == _watch);
       if (watch != NULL)
         {
           _dbus_loop_remove_watch (loop, watch);