Correct make distcheck and most gcc and sparse warnings.

  Remaining warnings are due to macros that check address or vectors
on the stack and auto generated yacc code.

  Compiled with default flags and also as:
% make CFLAGS=-DENTRY_TRACKING_ON -DDEBUG_ON -DASSERTIONS_ON
  to ensure the "simplification" of code like:
foo.c:
<hash>define DEBUG_VAR foo_VAR
<hash>include "foo.h"
...
foo.h:
<hash>ifdef DEBUG_VAR_NOT_LOCAL
extern
<hash>endif
int DEBUG_VAR;
...
did not change the author's "intended" logic.

1 files changed, 5 insertions, 8 deletions

diff --git a/xkbscan.c b/xkbscan.c
index bc7e230..31cafd4 100644
--- a/xkbscan.c
+++ b/xkbscan.c
@@ -35,6 +35,8 @@
 #include "utils.h"
 #include "parseutils.h"
 
+unsigned int scanDebug;
+
 FILE *yyin = NULL;
 
 static char scanFileBuf[1024] = {0};
@@ -42,20 +44,15 @@ char *scanFile = scanFileBuf;
 int lineNum = 0;
 
 int scanInt;
-char *scanIntStr;
-int scanIntClass;
 
 char *scanStr = NULL;
-int scanStrLine = 0;
+static int scanStrLine = 0;
 
 #define	BUFSIZE	512
 static int nInBuf = 0;
 static char buf[BUFSIZE];
 
 #ifdef DEBUG
-
-extern unsigned debugFlags;
-
 static char *
 tokText(int tok)
 {
@@ -446,7 +443,7 @@ yyGetKeyName(void)
     return ERROR_TOK;
 }
 
-struct _Keyword
+static struct _Keyword
 {
     const char *keyword;
     int token;
@@ -543,7 +540,7 @@ struct _Keyword
     {
     "alternate_group", ALTERNATE_GROUP}
 };
-int numKeywords = sizeof(keywords) / sizeof(struct _Keyword);
+static int numKeywords = sizeof(keywords) / sizeof(struct _Keyword);
 
 static int
 yyGetIdent(int first)