[PATCH 31/37] Remove initDependencies from ExtensionModule

[Daniel Stone]

This is now just an unused field, so remove it.

Signed-off-by: Daniel Stone <daniel at fooishbar.org>
---
 hw/xfree86/common/xf86Extensions.c |    4 ----
 hw/xfree86/dixmods/glxmodule.c     |    1 -
 include/extension.h                |    1 -
 mi/miinitext.c                     |   33 ++++++++++++++++-----------------
 4 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/hw/xfree86/common/xf86Extensions.c b/hw/xfree86/common/xf86Extensions.c
index b18c2ab..200dd0e 100644
--- a/hw/xfree86/common/xf86Extensions.c
+++ b/hw/xfree86/common/xf86Extensions.c
@@ -58,7 +58,6 @@ static ExtensionModule extensionModules[] = {
 	XFree86VidModeExtensionInit,
 	XF86VIDMODENAME,
 	&noXFree86VidModeExtension,
-	NULL,
 	NULL
     },
 #endif
@@ -67,7 +66,6 @@ static ExtensionModule extensionModules[] = {
 	XFree86DGAExtensionInit,
 	XF86DGANAME,
 	&noXFree86DGAExtension,
-	NULL,
 	NULL
     },
 #endif
@@ -76,7 +74,6 @@ static ExtensionModule extensionModules[] = {
         XFree86DRIExtensionInit,
         "XFree86-DRI",
         &noXFree86DRIExtension,
-        NULL,
         NULL
     },
 #endif
@@ -85,7 +82,6 @@ static ExtensionModule extensionModules[] = {
         DRI2ExtensionInit,
         DRI2_NAME,
         &noDRI2Extension,
-        NULL,
         NULL
     }
 #endif
diff --git a/hw/xfree86/dixmods/glxmodule.c b/hw/xfree86/dixmods/glxmodule.c
index bd195ba..6bc3788 100644
--- a/hw/xfree86/dixmods/glxmodule.c
+++ b/hw/xfree86/dixmods/glxmodule.c
@@ -50,7 +50,6 @@ static ExtensionModule GLXExt =
     GlxExtensionInit,
     "GLX",
     &noGlxExtension,
-    NULL,
     NULL
 };
 
diff --git a/include/extension.h b/include/extension.h
index 9bab5d3..cca00bc 100644
--- a/include/extension.h
+++ b/include/extension.h
@@ -86,7 +86,6 @@ typedef struct {
     const char *	name;
     Bool		*disablePtr;
     InitExtension	setupFunc;	
-    const char **	initDependencies;
 } ExtensionModule;
 
 extern _X_EXPORT unsigned short StandardMinorOpcode(ClientPtr /*client*/);
diff --git a/mi/miinitext.c b/mi/miinitext.c
index c1141fb..6caaa50 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -394,35 +394,35 @@ void EnableDisableExtensionError(char *name, Bool enable)
 
 /* List of built-in (statically linked) extensions */
 static ExtensionModule staticExtensions[] = {
-    { GEExtensionInit, "Generic Event Extension", &noGEExtension, NULL, NULL},
-    { ShapeExtensionInit, "SHAPE", NULL, NULL, NULL },
+    { GEExtensionInit, "Generic Event Extension", &noGEExtension, NULL },
+    { ShapeExtensionInit, "SHAPE", NULL, NULL },
 #ifdef MITSHM
-    { ShmExtensionInit, SHMNAME, &noMITShmExtension, NULL, NULL },
+    { ShmExtensionInit, SHMNAME, &noMITShmExtension, NULL },
 #endif
-    { XInputExtensionInit, "XInputExtension", NULL, NULL, NULL },
+    { XInputExtensionInit, "XInputExtension", NULL, NULL },
 #ifdef XTEST
-    { XTestExtensionInit, XTestExtensionName, &noTestExtensions, NULL, NULL },
+    { XTestExtensionInit, XTestExtensionName, &noTestExtensions, NULL },
 #endif
-    { BigReqExtensionInit, "BIG-REQUESTS", NULL, NULL, NULL },
-    { SyncExtensionInit, "SYNC", NULL, NULL, NULL },
-    { XkbExtensionInit, XkbName, NULL, NULL, NULL },
-    { XCMiscExtensionInit, "XC-MISC", NULL, NULL, NULL },
+    { BigReqExtensionInit, "BIG-REQUESTS", NULL, NULL },
+    { SyncExtensionInit, "SYNC", NULL, NULL },
+    { XkbExtensionInit, XkbName, NULL, NULL },
+    { XCMiscExtensionInit, "XC-MISC", NULL, NULL },
 #ifdef XCSECURITY
-    { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL },
+    { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL },
 #endif
 #ifdef PANORAMIX
-    { PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension, NULL, NULL },
+    { PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension, NULL },
 #endif
 #ifdef XFIXES
     /* must be before Render to layer DisplayCursor correctly */
-    { XFixesExtensionInit, "XFIXES", &noXFixesExtension, NULL, NULL },
+    { XFixesExtensionInit, "XFIXES", &noXFixesExtension, NULL },
 #endif
 #ifdef XF86BIGFONT
-    { XFree86BigfontExtensionInit, XF86BIGFONTNAME, &noXFree86BigfontExtension, NULL, NULL },
+    { XFree86BigfontExtensionInit, XF86BIGFONTNAME, &noXFree86BigfontExtension, NULL },
 #endif
-    { RenderExtensionInit, "RENDER", &noRenderExtension, NULL, NULL },
+    { RenderExtensionInit, "RENDER", &noRenderExtension, NULL },
 #ifdef RANDR
-    { RRExtensionInit, "RANDR", &noRRExtension, NULL, NULL },
+    { RRExtensionInit, "RANDR", &noRRExtension, NULL },
 #endif
 #ifdef COMPOSITE
     { CompositeExtensionInit, "COMPOSITE", &noCompositeExtension, NULL },
@@ -452,7 +452,7 @@ static ExtensionModule staticExtensions[] = {
 #ifdef XSELINUX
     { SELinuxExtensionInit, SELINUX_EXTENSION_NAME, &noSELinuxExtension, NULL },
 #endif
-    { NULL, NULL, NULL, NULL, NULL }
+    { NULL, NULL, NULL, NULL }
 };
 
 static ExtensionModule *ExtensionModuleList = NULL;
@@ -525,7 +525,6 @@ LoadExtension(ExtensionModule * e, Bool builtin)
     newext->initFunc = e->initFunc;
     newext->disablePtr = e->disablePtr;
     newext->setupFunc = e->setupFunc;
-    newext->initDependencies = e->initDependencies;
 
     if (e->setupFunc != NULL)
 	e->setupFunc();
-- 
1.7.5.4