xorg/driver/xf86-input-joystick: [PATCH 2/2] Janitor: gcc 4.5 and sparse warnings.

[Paulo César Pereira de Andrade]

  This patch corrects most gcc/sparse warnings.

  The correction for code in format:

if (a >= b)
  rel = a - b;
if (a <= b)
  rel = b - a;
rel = rel / foo;

was changed to the logical equivalent, and clear
to read, but also corrected the warning about rel
possibly being used uninitialized :-)

>From 861e86e0c16e2547332279d01a2eabf5546a0967 Mon Sep 17 00:00:00 2001
From: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br>
Date: Wed, 4 Feb 2009 18:23:00 -0200
Subject: [PATCH 2/2] Janitor: gcc 4.5 and sparse warnings.

  It is still required a patch in the X Server sdk to correct some
remaining warnings. Isn't it amazing that <X11/extensions/XKBsrv.h>
and $sdkdir/xkbsrv.h both use the #ifndef _XKBSRV_H_ include guard?

Signed-off-by: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br>
---
 src/jstk.c         |    2 +-
 src/jstk_axis.c    |    4 ++--
 src/jstk_key.c     |    6 +++++-
 src/jstk_options.c |    2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/jstk.c b/src/jstk.c
index 44acc48..a5ea298 100644
--- a/src/jstk.c
+++ b/src/jstk.c
@@ -519,7 +519,7 @@ jstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
     local->private = priv;
     local->type_name = XI_JOYSTICK;
     local->history_size = 0;
-    local->always_core_feedback = 0;
+    local->always_core_feedback = NULL;
     local->conf_idev = dev;
 
     priv->fd = -1;
diff --git a/src/jstk_axis.c b/src/jstk_axis.c
index 3c49bd3..233b2be 100644
--- a/src/jstk_axis.c
+++ b/src/jstk_axis.c
@@ -351,9 +351,9 @@ jstkHandleAbsoluteAxis(LocalDevicePtr device, int number)
     {
         float rel;
         int dif;
-        if (priv->axis[i].value >= priv->axis[i].deadzone)
+        if (priv->axis[i].value > priv->axis[i].deadzone)
             rel = (priv->axis[i].value - priv->axis[i].deadzone);
-        if (priv->axis[i].value <= -priv->axis[i].deadzone)
+        else
             rel = (priv->axis[i].value + priv->axis[i].deadzone);
 
         rel = (rel) / (2.0f * (float)(32768 - priv->axis[i].deadzone));
diff --git a/src/jstk_key.c b/src/jstk_key.c
index 4e9f710..b2c5b5d 100644
--- a/src/jstk_key.c
+++ b/src/jstk_key.c
@@ -34,9 +34,14 @@
 #include <X11/keysym.h>
 #include <X11/XF86keysym.h>
 #include <xf86Optrec.h>
+
 #include "jstk.h"
 #include "jstk_key.h"
 
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
+#include <xkbsrv.h>
+#endif
+
 #define AltMask		Mod1Mask
 #define NumLockMask	Mod2Mask
 #define AltLangMask	Mod3Mask
@@ -70,7 +75,6 @@ jstkInitKeys(DeviceIntPtr pJstk, JoystickDevPtr priv)
     int i, j;
     XkbSrvInfoPtr xkbi;
     XkbControlsPtr ctrls;
-    XkbComponentNamesRec xkbnames;
 
     static struct { KeySym keysym; CARD8 mask; } modifiers[] = {
         { XK_Shift_L,           ShiftMask },
diff --git a/src/jstk_options.c b/src/jstk_options.c
index 309175e..8c0aba1 100644
--- a/src/jstk_options.c
+++ b/src/jstk_options.c
@@ -50,7 +50,7 @@
  ***********************************************************************
  */
 
-int
+static int
 jstkGetKeyNumberInMap(JoystickDevPtr priv,
                       KeySym keysym)
 {
-- 
1.6.1

_______________________________________________
xorg mailing list
xorg@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/xorg