Events.c: fix two shadowed variables

Events.c: In function ‘nxagentDispatchEvents’: Events.c:1241:21: warning: declaration of ‘pScreen’ shadows a previous local [-Wshadow=compatible-local] ScreenPtr pScreen = nxagentScreen(X.xbutton.window); ^~~~~~~ Events.c:827:13: note: shadowed declaration is here ScreenPtr pScreen = NULL; ^~~~~~~ Events.c:1383:19: warning: declaration of ‘pScreen’ shadows a previous local [-Wshadow=compatible-local] ScreenPtr pScreen = nxagentScreen(X.xmotion.window); ^~~~~~~ Events.c:827:13: note: shadowed declaration is here ScreenPtr pScreen = NULL; ^~~~~~~ Events.c: In function ‘nxagentDispatchEvents’: Events.c:1383:19: warning: declaration of ‘pScreen’ shadows a previous local [-Wshadow=compatible-local] ScreenPtr pScreen = nxagentScreen(X.xmotion.window); ^~~~~~~ Events.c:827:13: note: shadowed declaration is here ScreenPtr pScreen = NULL; ^~~~~~~

Events.c: fix two shadowed variables
7031219d · Ulrich Sibiller · c137c2a4 · 7031219d
Commit 7031219d authored Jan 09, 2020 by Ulrich Sibiller
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Events.c nx-X11/programs/Xserver/hw/nxagent/Events.c +2 -2

No files found.
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -1238,7 +1238,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was not already
          int resource = nxagentWaitForResource(NXGetCollectGrabPointerResource,
                                                    nxagentCollectGrabPointerPredicate);

-          ScreenPtr pScreen = nxagentScreen(X.xbutton.window);
+          pScreen = nxagentScreen(X.xbutton.window);
          viewportCursor = XCreateFontCursor(nxagentDisplay, XC_fleur);

          NXCollectGrabPointer(nxagentDisplay, resource,
@@ -1380,7 +1380,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was not already
      }
      case MotionNotify:
      {
-        ScreenPtr pScreen = nxagentScreen(X.xmotion.window);
+        pScreen = nxagentScreen(X.xmotion.window);

        #ifdef TEST
        fprintf(stderr, "%s: Going to handle new MotionNotify event.\n", __func__);