_XkbFilterDeviceBtn: move variable declarations to match usage scope

Fix this warning: xkbActions.c: In function ‘_XkbFilterDeviceBtn’: xkbActions.c:1084:6: warning: declaration of ‘button’ shadows a previous local [-Wshadow=compatible-local] int button; ^~~~~~ xkbActions.c:1044:6: note: shadowed declaration is here int button; ^~~~~~ Backport of this xorg-xserver upstream commit: commit 41dd7cf673e47ab74c5065b8dbf268b2e5facb64 Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Mon Dec 12 16:49:34 2011 -0800 _XkbFilterDeviceBtn: move variable declarations to match usage scope The main body of this function is an if { } else if { } pair of blocks. Previously there was int button at the top level scope which is used only in the first block, and a redeclaration of int button inside the second block. Since there's no overlap in the code paths for the two uses of button, move the one from the outer block into the first block to help the programmer more quickly determine they are unrelated usages, and to silence the gcc warning of: xkbActions.c: In function '_XkbFilterDeviceBtn': xkbActions.c:999:6: warning: declaration of 'button' shadows a previous local xkbActions.c:955:6: warning: shadowed declaration is here For consistency, move DeviceIntPtr dev declarations as well that are used in the same way. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

_XkbFilterDeviceBtn: move variable declarations to match usage scope
1a1ace77 · Ulrich Sibiller · 914f88a8 · 1a1ace77
Commit 1a1ace77 authored Jan 09, 2020 by Ulrich Sibiller
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

xkbActions.c nx-X11/programs/Xserver/xkb/xkbActions.c +5 -4

No files found.
--- a/nx-X11/programs/Xserver/xkb/xkbActions.c
+++ b/nx-X11/programs/Xserver/xkb/xkbActions.c
@@ -1040,10 +1040,10 @@ _XkbFilterDeviceBtn(	XkbSrvInfoPtr	xkbi,
 			unsigned	keycode,
 			XkbAction *	pAction)
 {
-DeviceIntPtr	dev;
-int		button;
-
    if (filter->keycode==0) {		/* initial press */
+	DeviceIntPtr	dev;
+	int		button;
+
 	dev= _XkbLookupButtonDevice(pAction->devbtn.device,NULL);
 	if ((!dev)||(!dev->public.on)||(&dev->public==LookupPointerDevice()))
 	    return 1;
@@ -1081,7 +1081,8 @@ int		button;
 	}
    }
    else if (filter->keycode==keycode) {
-	int	button;
+	DeviceIntPtr	dev;
+	int		button;

 	filter->active= 0;
 	dev= _XkbLookupButtonDevice(filter->upAction.devbtn.device,NULL);