Compile warning fixes.

  Ansify a function with K&R style definition.
  Obey gcc in warning suggest parentheses around assignment used as truth value.
  Remove some unused variables.
  Remaining warning is about xf86AddModuleInfo being deprecated.

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

2 files changed, 3 insertions, 8 deletions

diff --git a/src/mouse.c b/src/mouse.c
index ce29f32..4f9a1b4 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -802,8 +802,8 @@ MouseHWOptions(InputInfoPtr pInfo)
 		pMse->resolution);
     }
 
-    if (mPriv->sensitivity 
-	= xf86SetRealOption(pInfo->options, "Sensitivity", 1.0)) {
+    if ((mPriv->sensitivity 
+	 = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0))) {
 	xf86Msg(X_CONFIG, "%s: Sensitivity: %g\n", pInfo->name,
 		mPriv->sensitivity);
     }
@@ -1860,8 +1860,6 @@ MouseConvert(InputInfoPtr pInfo, int first, int num, int v0, int v1, int v2,
 static void
 FlushButtons(MouseDevPtr pMse)
 {
-    int i, blocked;
-
     pMse->lastButtons = 0;
     pMse->lastMappedButtons = 0;
 }
diff --git a/src/pnp.c b/src/pnp.c
index edbc694..7ae13f2 100644
--- a/src/pnp.c
+++ b/src/pnp.c
@@ -551,10 +551,7 @@ pnpproto(pnpid_t *id)
 /* name/val mapping */
 
 static symtab_t *
-gettoken(tab, s, len)
-symtab_t *tab;
-char *s;
-int len;
+gettoken(symtab_t *tab, char *s, int len)
 {
     int i;