Remove all empty extension reset hooks, replace with NULL.
This commit is contained in:
parent
6bcde69585
commit
9757106bba
|
@ -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
|
||||
|
|
10
Xext/dpms.c
10
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
|
||||
|
|
13
Xext/saver.c
13
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;
|
||||
|
|
12
Xext/shape.c
12
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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
10
Xext/xevie.c
10
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)
|
||||
{
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
12
Xext/xtest.c
12
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
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -77,11 +77,6 @@ CompositeClientCallback (CallbackListPtr *list,
|
|||
pCompositeClient->minor_version = 0;
|
||||
}
|
||||
|
||||
static void
|
||||
CompositeResetProc (ExtensionEntry *extEntry)
|
||||
{
|
||||
}
|
||||
|
||||
static int
|
||||
FreeCompositeClientWindow (pointer value, XID ccwid)
|
||||
{
|
||||
|
@ -598,7 +593,7 @@ CompositeExtensionInit (void)
|
|||
|
||||
extEntry = AddExtension (COMPOSITE_NAME, 0, 0,
|
||||
ProcCompositeDispatch, SProcCompositeDispatch,
|
||||
CompositeResetProc, StandardMinorOpcode);
|
||||
NULL, StandardMinorOpcode);
|
||||
if (!extEntry)
|
||||
return;
|
||||
CompositeReqCode = (CARD8) extEntry->base;
|
||||
|
|
|
@ -113,10 +113,6 @@ static int _DMXXineramaActive(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void DMXResetProc(ExtensionEntry *extEntry)
|
||||
{
|
||||
}
|
||||
|
||||
/** Initialize the extension. */
|
||||
void DMXExtensionInit(void)
|
||||
{
|
||||
|
@ -124,7 +120,7 @@ void DMXExtensionInit(void)
|
|||
|
||||
if ((extEntry = AddExtension(DMX_EXTENSION_NAME, 0, 0,
|
||||
ProcDMXDispatch, SProcDMXDispatch,
|
||||
DMXResetProc, StandardMinorOpcode)))
|
||||
NULL, StandardMinorOpcode)))
|
||||
DMXCode = extEntry->base;
|
||||
}
|
||||
|
||||
|
|
|
@ -92,8 +92,6 @@ static DISPATCH_PROC(SProcXF86DRIQueryVersion);
|
|||
static DISPATCH_PROC(SProcXF86DRIQueryDirectRenderingCapable);
|
||||
static DISPATCH_PROC(SProcXF86DRIDispatch);
|
||||
|
||||
static void XF86DRIResetProc(ExtensionEntry* extEntry);
|
||||
|
||||
static Bool ephyrDRIScreenInit (ScreenPtr a_screen) ;
|
||||
static Bool ephyrDRICreateWindow (WindowPtr a_win) ;
|
||||
static Bool ephyrDRIDestroyWindow (WindowPtr a_win) ;
|
||||
|
@ -150,7 +148,7 @@ ephyrDRIExtensionInit (ScreenPtr a_screen)
|
|||
XF86DRINumberErrors,
|
||||
ProcXF86DRIDispatch,
|
||||
SProcXF86DRIDispatch,
|
||||
XF86DRIResetProc,
|
||||
NULL,
|
||||
StandardMinorOpcode))) {
|
||||
DRIReqCode = (unsigned char)extEntry->base;
|
||||
DRIErrorBase = extEntry->errorBase;
|
||||
|
@ -612,14 +610,6 @@ out:
|
|||
}
|
||||
|
||||
|
||||
/*ARGSUSED*/
|
||||
static void
|
||||
XF86DRIResetProc (
|
||||
ExtensionEntry* extEntry
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
static int
|
||||
ProcXF86DRIQueryVersion (register ClientPtr client)
|
||||
{
|
||||
|
|
|
@ -65,10 +65,6 @@ typedef struct {
|
|||
#define VM_SETPRIV(c,p) \
|
||||
dixSetPrivate(&(c)->devPrivates, VidModeClientPrivateKey, p)
|
||||
|
||||
static void XF86VidModeResetProc(
|
||||
ExtensionEntry* /* extEntry */
|
||||
);
|
||||
|
||||
static DISPATCH_PROC(ProcXF86VidModeDispatch);
|
||||
static DISPATCH_PROC(ProcXF86VidModeGetAllModeLines);
|
||||
static DISPATCH_PROC(ProcXF86VidModeGetModeLine);
|
||||
|
@ -199,7 +195,7 @@ XFree86VidModeExtensionInit(void)
|
|||
XF86VidModeNumberErrors,
|
||||
ProcXF86VidModeDispatch,
|
||||
SProcXF86VidModeDispatch,
|
||||
XF86VidModeResetProc,
|
||||
NULL,
|
||||
StandardMinorOpcode))) {
|
||||
#if 0
|
||||
XF86VidModeReqCode = (unsigned char)extEntry->base;
|
||||
|
@ -212,13 +208,6 @@ XFree86VidModeExtensionInit(void)
|
|||
}
|
||||
}
|
||||
|
||||
/*ARGSUSED*/
|
||||
static void
|
||||
XF86VidModeResetProc (extEntry)
|
||||
ExtensionEntry* extEntry;
|
||||
{
|
||||
}
|
||||
|
||||
static int
|
||||
ClientMajorVersion(ClientPtr client)
|
||||
{
|
||||
|
|
|
@ -322,11 +322,6 @@ SProcDRI2Dispatch (ClientPtr client)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
DRI2ResetProc (ExtensionEntry *extEntry)
|
||||
{
|
||||
}
|
||||
|
||||
static int DRI2DrawableGone(pointer p, XID id)
|
||||
{
|
||||
DrawablePtr pDrawable = p;
|
||||
|
@ -344,7 +339,7 @@ DRI2ExtensionInit(void)
|
|||
DRI2NumberErrors,
|
||||
ProcDRI2Dispatch,
|
||||
SProcDRI2Dispatch,
|
||||
DRI2ResetProc,
|
||||
NULL,
|
||||
StandardMinorOpcode);
|
||||
|
||||
dri2DrawableRes = CreateNewResourceType(DRI2DrawableGone);
|
||||
|
|
|
@ -74,8 +74,6 @@ static int WMErrorBase;
|
|||
static DISPATCH_PROC(ProcAppleWMDispatch);
|
||||
static DISPATCH_PROC(SProcAppleWMDispatch);
|
||||
|
||||
static void AppleWMResetProc(ExtensionEntry* extEntry);
|
||||
|
||||
static unsigned char WMReqCode = 0;
|
||||
static int WMEventBase = 0;
|
||||
|
||||
|
@ -124,7 +122,7 @@ AppleWMExtensionInit(
|
|||
AppleWMNumberErrors,
|
||||
ProcAppleWMDispatch,
|
||||
SProcAppleWMDispatch,
|
||||
AppleWMResetProc,
|
||||
NULL,
|
||||
StandardMinorOpcode)))
|
||||
{
|
||||
WMReqCode = (unsigned char)extEntry->base;
|
||||
|
@ -135,14 +133,6 @@ AppleWMExtensionInit(
|
|||
}
|
||||
}
|
||||
|
||||
/*ARGSUSED*/
|
||||
static void
|
||||
AppleWMResetProc (
|
||||
ExtensionEntry* extEntry
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
/* Updates the _NATIVE_SCREEN_ORIGIN property on the given root window. */
|
||||
void
|
||||
AppleWMSetScreenOrigin(
|
||||
|
|
|
@ -49,8 +49,6 @@ static int WMErrorBase;
|
|||
static DISPATCH_PROC(ProcWindowsWMDispatch);
|
||||
static DISPATCH_PROC(SProcWindowsWMDispatch);
|
||||
|
||||
static void WindowsWMResetProc(ExtensionEntry* extEntry);
|
||||
|
||||
static unsigned char WMReqCode = 0;
|
||||
static int WMEventBase = 0;
|
||||
|
||||
|
@ -98,7 +96,7 @@ winWindowsWMExtensionInit ()
|
|||
WindowsWMNumberErrors,
|
||||
ProcWindowsWMDispatch,
|
||||
SProcWindowsWMDispatch,
|
||||
WindowsWMResetProc,
|
||||
NULL,
|
||||
StandardMinorOpcode)))
|
||||
{
|
||||
WMReqCode = (unsigned char)extEntry->base;
|
||||
|
@ -108,12 +106,6 @@ winWindowsWMExtensionInit ()
|
|||
}
|
||||
}
|
||||
|
||||
/*ARGSUSED*/
|
||||
static void
|
||||
WindowsWMResetProc (ExtensionEntry* extEntry)
|
||||
{
|
||||
}
|
||||
|
||||
static int
|
||||
ProcWindowsWMQueryVersion(register ClientPtr client)
|
||||
{
|
||||
|
|
|
@ -86,11 +86,6 @@ RRClientCallback (CallbackListPtr *list,
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
RRResetProc (ExtensionEntry *extEntry)
|
||||
{
|
||||
}
|
||||
|
||||
static Bool
|
||||
RRCloseScreen (int i, ScreenPtr pScreen)
|
||||
{
|
||||
|
@ -339,7 +334,7 @@ RRExtensionInit (void)
|
|||
return;
|
||||
extEntry = AddExtension (RANDR_NAME, RRNumberEvents, RRNumberErrors,
|
||||
ProcRRDispatch, SProcRRDispatch,
|
||||
RRResetProc, StandardMinorOpcode);
|
||||
NULL, StandardMinorOpcode);
|
||||
if (!extEntry)
|
||||
return;
|
||||
RRErrorBase = extEntry->errorBase;
|
||||
|
|
|
@ -415,11 +415,6 @@ SProcRRXineramaDispatch(ClientPtr client)
|
|||
return BadRequest;
|
||||
}
|
||||
|
||||
static void
|
||||
RRXineramaResetProc(ExtensionEntry* extEntry)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
RRXineramaExtensionInit(void)
|
||||
{
|
||||
|
@ -439,6 +434,6 @@ RRXineramaExtensionInit(void)
|
|||
(void) AddExtension(PANORAMIX_PROTOCOL_NAME, 0,0,
|
||||
ProcRRXineramaDispatch,
|
||||
SProcRRXineramaDispatch,
|
||||
RRXineramaResetProc,
|
||||
NULL,
|
||||
StandardMinorOpcode);
|
||||
}
|
||||
|
|
|
@ -210,9 +210,6 @@ int (*SProcRenderVector[RenderNumberRequests])(ClientPtr) = {
|
|||
SProcRenderCreateConicalGradient
|
||||
};
|
||||
|
||||
static void
|
||||
RenderResetProc (ExtensionEntry *extEntry);
|
||||
|
||||
int RenderErrBase;
|
||||
DevPrivateKey RenderClientPrivateKey;
|
||||
|
||||
|
@ -252,17 +249,12 @@ RenderExtensionInit (void)
|
|||
|
||||
extEntry = AddExtension (RENDER_NAME, 0, RenderNumberErrors,
|
||||
ProcRenderDispatch, SProcRenderDispatch,
|
||||
RenderResetProc, StandardMinorOpcode);
|
||||
NULL, StandardMinorOpcode);
|
||||
if (!extEntry)
|
||||
return;
|
||||
RenderErrBase = extEntry->errorBase;
|
||||
}
|
||||
|
||||
static void
|
||||
RenderResetProc (ExtensionEntry *extEntry)
|
||||
{
|
||||
}
|
||||
|
||||
static int
|
||||
ProcRenderQueryVersion (ClientPtr client)
|
||||
{
|
||||
|
|
|
@ -6199,12 +6199,6 @@ XkbClientGone(pointer data,XID id)
|
|||
return 1;
|
||||
}
|
||||
|
||||
/*ARGSUSED*/
|
||||
static void
|
||||
XkbResetProc(ExtensionEntry *extEntry)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
XkbExtensionInit(void)
|
||||
{
|
||||
|
@ -6212,7 +6206,7 @@ XkbExtensionInit(void)
|
|||
|
||||
if ((extEntry = AddExtension(XkbName, XkbNumberEvents, XkbNumberErrors,
|
||||
ProcXkbDispatch, SProcXkbDispatch,
|
||||
XkbResetProc, StandardMinorOpcode))) {
|
||||
NULL, StandardMinorOpcode))) {
|
||||
XkbReqCode = (unsigned char)extEntry->base;
|
||||
XkbEventBase = (unsigned char)extEntry->eventBase;
|
||||
XkbErrorBase = (unsigned char)extEntry->errorBase;
|
||||
|
|
Loading…
Reference in New Issue
Block a user