From 7b5e562ea74039832116ee13db910f290f074782 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 8 Mar 2011 15:33:11 -0500 Subject: [PATCH] input: warning fix getevents.c:770:5: warning: suggest parentheses around '&&' within '||' Introduced with dc57f89959e549403f8488eb9f23425bd7118b22: - if(dev->u.master && dev->valuator) { + if(dev->valuator && IsMaster(dev) || !IsFloating(dev)) { So I'm assuming the two terms around the || are meant to be a unit. Signed-off-by: Adam Jackson Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer --- dix/getevents.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dix/getevents.c b/dix/getevents.c index 1403ccc57..441c20f56 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -767,7 +767,7 @@ moveRelative(DeviceIntPtr dev, int *x, int *y, ValuatorMask *mask) /* if attached, clip both x and y to the defined limits (usually * co-ord space limit). If it is attached, we need x/y to go over the * limits to be able to change screens. */ - if(dev->valuator && IsMaster(dev) || !IsFloating(dev)) { + if (dev->valuator && (IsMaster(dev) || !IsFloating(dev))) { if (valuator_get_mode(dev, 0) == Absolute) clipAxis(dev, 0, x); if (valuator_get_mode(dev, 1) == Absolute)