Scale back global variables

Some of the global variables were either not used anymore or only used
in the listing code.

diff --git a/src/xkbcomp/listing.c b/src/xkbcomp/listing.c
index e509b96..5b4f552 100644 (file)
--- a/src/xkbcomp/listing.c
+++ b/src/xkbcomp/listing.c
@@ -144,6 +144,9 @@ static char **mapOnly;
 
 static Listing *list = NULL;
 
+static unsigned verboseLevel;
+static unsigned dirsToStrip;
+
 /***====================================================================***/
 
 int

diff --git a/src/xkbcomp/xkbcomp.h b/src/xkbcomp/xkbcomp.h
index e9d5f47..c45918d 100644 (file)
--- a/src/xkbcomp/xkbcomp.h
+++ b/src/xkbcomp/xkbcomp.h
@@ -113,7 +113,6 @@ typedef struct _ParseCommon
 #define        CreateKeyNames(x)       ((x)->flags&AutoKeyNames)
 
 extern unsigned warningLevel;
-extern unsigned optionalParts;
 
 typedef struct _IncludeStmt
 {
@@ -367,10 +366,6 @@ CompileSymbols(XkbFile *file, XkbcDescPtr xkb, unsigned merge);
 #define        WantFullNames   (1<<3)
 #define        ListRecursive   (1<<4)
 
-extern char *rootDir;
-extern unsigned verboseLevel;
-extern unsigned dirsToStrip;
-
 extern Bool AddListing(char * /* file */ ,
                        char *   /* map */
     );