summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Richardson <arichardson.kde@gmail.com>2022-05-15 11:34:48 +0100
committerSimon McVittie <smcv@collabora.com>2022-09-13 12:47:29 +0100
commite1d2cd286b31d206fe3ac434fbf7c84f5138de94 (patch)
tree583d5226633de06a2822773ac5f0190fcc88a1fd
parent890f0e0fc68fb40a6e461b0940aa9412f1758705 (diff)
downloaddbus-e1d2cd286b31d206fe3ac434fbf7c84f5138de94.tar.gz
dir-watch-kqueue: Silence -Wshadow warning
This should be the last warning that is preventing us from using -Werror for FreeBSD builds. (cherry picked from commit 2480181af4ef0cae65aab303e103b58d8f6f2066) Backported-from: dbus!307
-rw-r--r--bus/dir-watch-kqueue.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/bus/dir-watch-kqueue.c b/bus/dir-watch-kqueue.c
index 15519fcb..a4ed7ca5 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);