diff options
Diffstat (limited to 'listing.c')
| -rw-r--r-- | listing.c | 46 |
1 files changed, 4 insertions, 42 deletions
@@ -70,6 +70,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/programs/xkbcomp/listing.c,v 3.10 2002/06/05 00:00:37 dawes Exp $ */ #include <stdio.h> @@ -85,9 +86,7 @@ SOFTWARE. #define DEBUG_VAR_NOT_LOCAL #define DEBUG_VAR listingDebug #include "xkbcomp.h" -#ifndef X_NOT_STDC_ENV #include <stdlib.h> -#endif #ifndef X_NOT_POSIX #ifdef _POSIX_SOURCE #include <limits.h> @@ -163,12 +162,7 @@ static Listing * list= NULL; /***====================================================================***/ int -#if NeedFunctionPrototypes AddMapOnly(char *map) -#else -AddMapOnly(map) - char *map; -#endif { if (nMapOnly>=szMapOnly) { if (szMapOnly<1) szMapOnly= 5; @@ -184,13 +178,7 @@ AddMapOnly(map) } int -#if NeedFunctionPrototypes AddListing(char *file,char *map) -#else -AddListing(file,map) - char *file; - char *map; -#endif { if (nListed>=szListing) { if (szListing<1) szListing= 10; @@ -214,14 +202,7 @@ AddListing(file,map) /***====================================================================***/ static void -#if NeedFunctionPrototypes ListFile(FILE *outFile,char *fileName,XkbFile *map) -#else -ListFile(outFile,fileName,map) -FILE * outFile; -char * fileName; -XkbFile * map; -#endif { register unsigned flags; char * mapName; @@ -269,15 +250,7 @@ char * mapName; /***====================================================================***/ static int -#if NeedFunctionPrototypes AddDirectory(char *head,char *ptrn,char *rest,char *map) -#else -AddDirectory(head,ptrn,rest,map) - char * head; - char * ptrn; - char * rest; - char * map; -#endif { #ifdef WIN32 HANDLE dirh; @@ -359,12 +332,7 @@ AddDirectory(head,ptrn,rest,map) /***====================================================================***/ Bool -#if NeedFunctionPrototypes AddMatchingFiles(char *head_in) -#else -AddMatchingFiles(head_in) - char * head_in; -#endif { char *str,*head,*ptrn,*rest= NULL; @@ -406,10 +374,8 @@ char *str,*head,*ptrn,*rest= NULL; /***====================================================================***/ -Bool -MapMatches(mapToConsider,ptrn) - char * mapToConsider; - char * ptrn; +static Bool +MapMatches(char *mapToConsider, char *ptrn) { int i; @@ -425,12 +391,7 @@ int i; } int -#if NeedFunctionPrototypes GenerateListing(char *out_name) -#else -GenerateListing(out_name) - char * out_name; -#endif { int i; FILE * inputFile,*outFile; @@ -482,6 +443,7 @@ char * mapName; WARN1("Couldn't open \"%s\"\n",list[i].file); continue; } + setScanState(list[i].file, 1); if (XKBParseFile(inputFile,&rtrn)&&(rtrn!=NULL)) { mapName= list[i].map; mapToUse= rtrn; |