XKB: Ditch XkbFileInfo

Sorry about the megacommit, but this touches on a lot of stuff.

Get rid of XkbFileInfo, which was pretty seriously redundant, and move the
only useful thing it had (defined) into XkbDescRec.  defined will be removed
pretty soon anyway.  Is the compat map pointer non-NULL? Then you have a
compat map, congratulations! Anyhow, I digress.

All functions that took an XkbFileInfoPtr now take an XkbDescPtr, _except_
XkmReadFile, which returns an XkbDescPtr *, because people want to deal in
XkbDescPtrs, not XkbDescRecs.

1 files changed, 16 insertions, 29 deletions

diff --git a/include/xkbfile.h b/include/xkbfile.h
index e90d7668e..0a6cb18b9 100644
--- a/include/xkbfile.h
+++ b/include/xkbfile.h
@@ -37,15 +37,9 @@
 #define	XkbMapDefined		(1<<0)
 #define	XkbStateDefined		(1<<1)
 
-typedef struct _XkbFileInfo {
-    unsigned		type;
-    unsigned		defined;
-    XkbDescPtr	 	xkb;
-} XkbFileInfo,*XkbFileInfoPtr;
-
 typedef void	(*XkbFileAddOnFunc)(
     FILE *		/* file */,
-    XkbFileInfo *	/* result */,
+    XkbDescPtr  	/* result */,
     Bool		/* topLevel */,
     Bool		/* showImplicit */,
     int			/* fileSection */,
@@ -277,12 +271,6 @@ extern	unsigned	XkbConvertXkbComponents(
     unsigned 		/* orig */
 );
 
-extern	Bool	XkbDetermineFileType(
-    XkbFileInfo *	/* xkb */,
-    int			/* format */,
-    int *		/* opts_missing */
-);
-
 extern	Bool	XkbNameMatchesPattern(
     char *		/* name */,
     char *		/* pattern */
@@ -292,7 +280,7 @@ extern	Bool	XkbNameMatchesPattern(
 
 extern	Bool	XkbWriteXKBKeycodes(
     FILE *		/* file */,
-    XkbFileInfo *	/* result */,
+    XkbDescPtr          /* result */,
     Bool		/* topLevel */,
     Bool		/* showImplicit */,
     XkbFileAddOnFunc	/* addOn */,
@@ -301,7 +289,7 @@ extern	Bool	XkbWriteXKBKeycodes(
 
 extern	Bool	XkbWriteXKBKeyTypes(
     FILE *		/* file */,
-    XkbFileInfo *	/* result */,
+    XkbDescPtr  	/* result */,
     Bool		/* topLevel */,
     Bool		/* showImplicit */,
     XkbFileAddOnFunc	/* addOn */,
@@ -310,7 +298,7 @@ extern	Bool	XkbWriteXKBKeyTypes(
 
 extern	Bool	XkbWriteXKBCompatMap(
     FILE *		/* file */,
-    XkbFileInfo *	/* result */,
+    XkbDescPtr	/* result */,
     Bool		/* topLevel */,
     Bool		/* showImplicit */,
     XkbFileAddOnFunc	/* addOn */,
@@ -319,7 +307,7 @@ extern	Bool	XkbWriteXKBCompatMap(
 
 extern	Bool	XkbWriteXKBSymbols(
     FILE *		/* file */,
-    XkbFileInfo *	/* result */,
+    XkbDescPtr	/* result */,
     Bool		/* topLevel */,
     Bool		/* showImplicit */,
     XkbFileAddOnFunc	/* addOn */,
@@ -328,7 +316,7 @@ extern	Bool	XkbWriteXKBSymbols(
 
 extern	Bool	XkbWriteXKBGeometry(
     FILE *		/* file */,
-    XkbFileInfo *	/* result */,
+    XkbDescPtr	/* result */,
     Bool		/* topLevel */,
     Bool		/* showImplicit */,
     XkbFileAddOnFunc	/* addOn */,
@@ -337,7 +325,7 @@ extern	Bool	XkbWriteXKBGeometry(
 
 extern	Bool	XkbWriteXKBSemantics(
     FILE *		/* file */,
-    XkbFileInfo *	/* result */,
+    XkbDescPtr	/* result */,
     Bool		/* topLevel */,
     Bool		/* showImplicit */,
     XkbFileAddOnFunc	/* addOn */,
@@ -346,7 +334,7 @@ extern	Bool	XkbWriteXKBSemantics(
 
 extern	Bool	XkbWriteXKBLayout(
     FILE *		/* file */,
-    XkbFileInfo *	/* result */,
+    XkbDescPtr	/* result */,
     Bool		/* topLevel */,
     Bool		/* showImplicit */,
     XkbFileAddOnFunc	/* addOn */,
@@ -355,7 +343,7 @@ extern	Bool	XkbWriteXKBLayout(
 
 extern	Bool	XkbWriteXKBKeymap(
     FILE *		/* file */,
-    XkbFileInfo *	/* result */,
+    XkbDescPtr	/* result */,
     Bool		/* topLevel */,
     Bool		/* showImplicit */,
     XkbFileAddOnFunc	/* addOn */,
@@ -364,7 +352,7 @@ extern	Bool	XkbWriteXKBKeymap(
 
 extern	Bool	XkbWriteXKBFile(
     FILE *		/* file */,
-    XkbFileInfo *	/* result */,
+    XkbDescPtr	/* result */,
     Bool		/* showImplicit */,
     XkbFileAddOnFunc	/* addOn */,
     void *		/* priv */
@@ -373,16 +361,16 @@ extern	Bool	XkbWriteXKBFile(
 extern	Bool	XkbWriteCFile(
     FILE *		/* file */,
     char *		/* name */,
-    XkbFileInfo *	/* info */
+    XkbDescPtr	/* info */
 );
 
 extern	Bool	XkbWriteXKMFile(
     FILE *		/* file */,
-    XkbFileInfo *	/* result */
+    XkbDescPtr	/* result */
 );
 
 extern	Bool	XkbWriteToServer(
-    XkbFileInfo *	/* result */
+    XkbDescPtr	/* result */
 );
 
 extern	void	XkbEnsureSafeMapName(
@@ -398,8 +386,7 @@ extern	Bool	XkbWriteXKBKeymapForNames(
 );
 
 extern	Status	XkbMergeFile(
-    XkbDescPtr			/* xkb */,
-    XkbFileInfo			/* finfo */
+    XkbDescPtr			/* xkb */
 );
 
 /***====================================================================***/
@@ -412,7 +399,7 @@ extern unsigned	XkmReadFile(
     FILE *		/* file */,
     unsigned		/* need */,
     unsigned		/* want */,
-    XkbFileInfo *	/* result */
+    XkbDescPtr	        * /* result */
 );
 
 #ifdef _XKMFORMAT_H_
@@ -433,7 +420,7 @@ extern xkmSectionInfo *XkmFindTOCEntry(
 extern Bool	XkmReadFileSection(
     FILE *              /* file */,
     xkmSectionInfo *    /* toc */,
-    XkbFileInfo *       /* result */,
+    XkbDescPtr       /* result */,
     unsigned *          /* loaded_rtrn */
 );