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, 4 deletions

diff --git a/xkbcomp.c b/xkbcomp.c
index ae5145d..988b5c5 100644
--- a/xkbcomp.c
+++ b/xkbcomp.c
@@ -38,7 +38,6 @@
 #include <malloc.h>
 #endif
 
-#define	DEBUG_VAR_NOT_LOCAL
 #define	DEBUG_VAR debugFlags
 #include "xkbcomp.h"
 #include <stdlib.h>
@@ -74,6 +73,8 @@
 #define	INPUT_XKB	1
 #define	INPUT_XKM	2
 
+unsigned int debugFlags;
+
 static const char *fileTypeExt[] = {
     "XXX",
     "xkm",
@@ -633,10 +634,10 @@ parseArgs(int argc, char *argv[])
         inputFormat = INPUT_XKB;
     }
 #ifndef WIN32
-    else if (strchr(inputFile, ':') == 0)
+    else if (strchr(inputFile, ':') == NULL)
     {
 #else
-    else if ((strchr(inputFile, ':') == 0) || (strlen(inputFile) > 2 &&
+    else if ((strchr(inputFile, ':') == NULL) || (strlen(inputFile) > 2 &&
                                                isalpha(inputFile[0]) &&
                                                inputFile[1] == ':'
                                                && strchr(inputFile + 2,
@@ -648,7 +649,7 @@ parseArgs(int argc, char *argv[])
         if (inputFile[len - 1] == ')')
         {
             char *tmp;
-            if ((tmp = strchr(inputFile, '(')) != 0)
+            if ((tmp = strchr(inputFile, '(')) != NULL)
             {
                 *tmp = '\0';
                 inputFile[len - 1] = '\0';