Remove all empty extension reset hooks, replace with NULL.

10 files changed, 10 insertions, 94 deletions

diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index f0dec2960..1e807d820 100644
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -41,10 +41,6 @@ from The Open Group.
 #include "opaque.h"
 #include "modinit.h"
 
-static void BigReqResetProc(
-    ExtensionEntry * /* extEntry */
-);
-
 static DISPATCH_PROC(ProcBigReqDispatch);
 
 void
@@ -52,14 +48,7 @@ BigReqExtensionInit(INITARGS)
 {
     AddExtension(XBigReqExtensionName, 0, 0,
 		 ProcBigReqDispatch, ProcBigReqDispatch,
-		 BigReqResetProc, StandardMinorOpcode);
-}
-
-/*ARGSUSED*/
-static void
-BigReqResetProc (extEntry)
-    ExtensionEntry	*extEntry;
-{
+		 NULL, StandardMinorOpcode);
 }
 
 static int
diff --git a/Xext/dpms.c b/Xext/dpms.c
index 54871c575..bad7aa64f 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -68,21 +68,13 @@ static DISPATCH_PROC(ProcDPMSInfo);
 static DISPATCH_PROC(SProcDPMSInfo);
 static DISPATCH_PROC(ProcDPMSCapable);
 static DISPATCH_PROC(SProcDPMSCapable);
-static void DPMSResetProc(ExtensionEntry* extEntry);
 
 void
 DPMSExtensionInit(INITARGS)
 {
     AddExtension(DPMSExtensionName, 0, 0,
 		 ProcDPMSDispatch, SProcDPMSDispatch,
-		 DPMSResetProc, StandardMinorOpcode);
-}
-
-/*ARGSUSED*/
-static void
-DPMSResetProc (extEntry)
-    ExtensionEntry	*extEntry;
-{
+		 NULL, StandardMinorOpcode);
 }
 
 static int
diff --git a/Xext/saver.c b/Xext/saver.c
index 69a5fa140..d74495bfa 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -110,10 +110,6 @@ static void SScreenSaverNotifyEvent (
 	xScreenSaverNotifyEvent * /* to */
 	);
 
-static void ScreenSaverResetProc (
-	ExtensionEntry * /* extEntry */
-	);
-
 static RESTYPE SuspendType;  /* resource type for suspension records */
 
 typedef struct _ScreenSaverSuspension *ScreenSaverSuspensionPtr;
@@ -269,20 +265,13 @@ ScreenSaverExtensionInit(INITARGS)
     if (AttrType && EventType && SuspendType &&
 	(extEntry = AddExtension(ScreenSaverName, ScreenSaverNumberEvents, 0,
 				 ProcScreenSaverDispatch, SProcScreenSaverDispatch,
-				 ScreenSaverResetProc, StandardMinorOpcode)))
+				 NULL, StandardMinorOpcode)))
     {
 	ScreenSaverEventBase = extEntry->eventBase;
 	EventSwapVector[ScreenSaverEventBase] = (EventSwapPtr) SScreenSaverNotifyEvent;
     }
 }
 
-/*ARGSUSED*/
-static void
-ScreenSaverResetProc (extEntry)
-ExtensionEntry	*extEntry;
-{
-}
-
 static void
 CheckScreenPrivate (pScreen)
     ScreenPtr	pScreen;
diff --git a/Xext/shape.c b/Xext/shape.c
index 6857c2865..aaef0cb14 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -61,9 +61,6 @@ static int ShapeFreeEvents(
 	pointer /* data */,
 	XID /* id */
 	);
-static void ShapeResetProc(
-	ExtensionEntry * /* extEntry */
-	);
 static void SShapeNotifyEvent(
 	xShapeNotifyEvent * /* from */,
 	xShapeNotifyEvent * /* to */
@@ -149,20 +146,13 @@ ShapeExtensionInit(void)
     if (ClientType && EventType &&
 	(extEntry = AddExtension(SHAPENAME, ShapeNumberEvents, 0,
 				 ProcShapeDispatch, SProcShapeDispatch,
-				 ShapeResetProc, StandardMinorOpcode)))
+				 NULL, StandardMinorOpcode)))
     {
 	ShapeEventBase = extEntry->eventBase;
 	EventSwapVector[ShapeEventBase] = (EventSwapPtr) SShapeNotifyEvent;
     }
 }
 
-/*ARGSUSED*/
-static void
-ShapeResetProc (extEntry)
-ExtensionEntry	*extEntry;
-{
-}
-
 static int
 RegionOperate (client, pWin, kind, destRgnp, srcRgn, op, xoff, yoff, create)
     ClientPtr	client;
diff --git a/Xext/xcalibrate.c b/Xext/xcalibrate.c
index 3fe2bdc5c..3e05e6ca2 100644
--- a/Xext/xcalibrate.c
+++ b/Xext/xcalibrate.c
@@ -218,11 +218,6 @@ SProcXCalibrateScreenToCoord (ClientPtr client)
   return ProcXCalibrateScreenToCoord(client);
 }
 
-static void
-XCalibrateResetProc (ExtensionEntry *extEntry) 
-{ 
-}
-
 static int
 ProcXCalibrateDispatch (ClientPtr client)
 {
@@ -292,7 +287,7 @@ XCalibrateExtensionInit(void)
 
   extEntry = AddExtension(XCALIBRATE_NAME, XCalibrateNumberEvents, XCalibrateNumberErrors,
 			  ProcXCalibrateDispatch, SProcXCalibrateDispatch,
-			  XCalibrateResetProc, StandardMinorOpcode);
+			  NULL, StandardMinorOpcode);
 
   if (!extEntry)
     return;
diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index 2f6208f1b..1ee173bd6 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -48,10 +48,6 @@ from The Open Group.
 #define UINT32_MAX 0xffffffffU
 #endif
 
-static void XCMiscResetProc(
-    ExtensionEntry * /* extEntry */
-);
-
 static DISPATCH_PROC(ProcXCMiscDispatch);
 static DISPATCH_PROC(ProcXCMiscGetVersion);
 static DISPATCH_PROC(ProcXCMiscGetXIDList);
@@ -66,14 +62,7 @@ XCMiscExtensionInit(INITARGS)
 {
     AddExtension(XCMiscExtensionName, 0, 0,
 		 ProcXCMiscDispatch, SProcXCMiscDispatch,
-		 XCMiscResetProc, StandardMinorOpcode);
-}
-
-/*ARGSUSED*/
-static void
-XCMiscResetProc (extEntry)
-    ExtensionEntry	*extEntry;
-{
+		 NULL, StandardMinorOpcode);
 }
 
 static int
diff --git a/Xext/xevie.c b/Xext/xevie.c
index a5b183790..bbbf04524 100644
--- a/Xext/xevie.c
+++ b/Xext/xevie.c
@@ -67,8 +67,6 @@ extern int    xeviegrabState;
 static DISPATCH_PROC(ProcXevieDispatch);
 static DISPATCH_PROC(SProcXevieDispatch);
 
-static void		XevieResetProc (ExtensionEntry *extEntry);
-
 static unsigned char	XevieReqCode = 0;
 static int		XevieErrorBase;
 
@@ -140,19 +138,13 @@ XevieExtensionInit (void)
 				XevieNumberErrors,
 				ProcXevieDispatch,
 				SProcXevieDispatch,
-				XevieResetProc,
+				NULL,
 				StandardMinorOpcode))) {
 	XevieReqCode = (unsigned char)extEntry->base;
 	XevieErrorBase = extEntry->errorBase;
     }
 }
 
-/*ARGSUSED*/
-static 
-void XevieResetProc (ExtensionEntry *extEntry)
-{
-}
-
 static 
 int ProcXevieQueryVersion (ClientPtr client)
 {
diff --git a/Xext/xres.c b/Xext/xres.c
index 3c47012fd..75ade58a1 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -301,10 +301,6 @@ ProcXResQueryClientPixmapBytes (ClientPtr client)
     return (client->noClientException);
 }
 
-
-static void
-ResResetProc (ExtensionEntry *extEntry) { }
-
 static int
 ProcResDispatch (ClientPtr client)
 {
@@ -386,5 +382,5 @@ ResExtensionInit(INITARGS)
 {
     (void) AddExtension(XRES_NAME, 0, 0,
                             ProcResDispatch, SProcResDispatch,
-                            ResResetProc, StandardMinorOpcode);
+                            NULL, StandardMinorOpcode);
 }
diff --git a/Xext/xtest.c b/Xext/xtest.c
index 8e96f6573..fbf2a2728 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -60,9 +60,6 @@ extern int DeviceMotionNotify;
 #include "panoramiXsrv.h"
 #endif
 
-static void XTestResetProc(
-        ExtensionEntry * /* extEntry */
-        );
 static int XTestSwapFakeInput(
         ClientPtr /* client */,
         xReq * /* req */
@@ -84,14 +81,7 @@ XTestExtensionInit(INITARGS)
 {
     AddExtension(XTestExtensionName, 0, 0,
             ProcXTestDispatch, SProcXTestDispatch,
-            XTestResetProc, StandardMinorOpcode);
-}
-
-/*ARGSUSED*/
-static void
-XTestResetProc (extEntry)
-    ExtensionEntry	*extEntry;
-{
+            NULL, StandardMinorOpcode);
 }
 
 static int
diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index 3a77eb6ea..dc1e7dd98 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -108,12 +108,6 @@ XvMCDestroySubpictureRes(pointer data, XID id)
    return Success;
 }
 
-static void
-XvMCResetProc (ExtensionEntry *extEntry)
-{
-}
-
-
 static int 
 ProcXvMCQueryVersion(ClientPtr client)
 {
@@ -688,7 +682,7 @@ XvMCExtensionInit(void)
 
    extEntry = AddExtension(XvMCName, XvMCNumEvents, XvMCNumErrors, 
                               ProcXvMCDispatch, SProcXvMCDispatch,
-                              XvMCResetProc, StandardMinorOpcode);
+                              NULL, StandardMinorOpcode);
 
    if(!extEntry) return;