[PATCH v2 0/1] MR6982: winebth.sys: Fix new bluetooth events being incorrect set due to variable shadowing.

[Vibhav Pant (＠vibhavp)]

(Reported by Coverity)

--
  v2: winebth.sys: Fix new bluetooth events being incorrect set due to variable shadowing.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6982

[PATCH v2 1/1] winebth.sys: Fix new bluetooth events being incorrect set due to variable shadowing.

[Vibhav Pant]

From: Vibhav Pant <vibhavp(a)gmail.com>

---
 dlls/winebth.sys/dbus.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/winebth.sys/dbus.c b/dlls/winebth.sys/dbus.c
index 155b5f14190..d6620f91514 100644
--- a/dlls/winebth.sys/dbus.c
+++ b/dlls/winebth.sys/dbus.c
@@ -895,18 +895,18 @@ static BOOL bluez_watcher_event_queue_ready( struct bluez_watcher_ctx *ctx, stru
     }
     if (!list_empty( &ctx->event_list ))
     {
-        struct bluez_watcher_event *event =
+        struct bluez_watcher_event *watcher_event =
             LIST_ENTRY( list_head( &ctx->event_list ), struct bluez_watcher_event, entry );
 
-        if (event->pending_call && !p_dbus_pending_call_get_completed( event->pending_call ))
+        if (watcher_event->pending_call && !p_dbus_pending_call_get_completed( watcher_event->pending_call ))
             return FALSE;
 
-        event->event_type = event->event_type;
-        event->event = event->event;
-        list_remove( &event->entry );
-        if (event->pending_call)
-            p_dbus_pending_call_unref( event->pending_call );
-        free( event );
+        event->event_type = watcher_event->event_type;
+        event->event_data = watcher_event->event;
+        list_remove( &watcher_event->entry );
+        if (watcher_event->pending_call)
+            p_dbus_pending_call_unref( watcher_event->pending_call );
+        free( watcher_event );
         return TRUE;
     }
     return FALSE;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6982