frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace INITARGS with void 

INITARGS was a hardcoded define to void.  Since knowing the function
signature for your extensions is kinda useful, just replace it with a
hardcoded void, but leave the define there for API compatibility.

Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Tomas Carnecky 2012-07-10 02:02:53 +01:00 committed by Keith Packard
parent bddb8c6cbe
commit 5079db78ae
16 changed files with 65 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Xext/bigreq.c
View File

@ -40,7 +40,7 @@ from The Open Group.
#include "opaque.h" #include "opaque.h"
#include "modinit.h" #include "modinit.h"
void BigReqExtensionInit(INITARGS); void BigReqExtensionInit(void);
static int static int
ProcBigReqDispatch(ClientPtr client) ProcBigReqDispatch(ClientPtr client)
@ -70,7 +70,7 @@ ProcBigReqDispatch(ClientPtr client)
} }
void void
BigReqExtensionInit(INITARGS) BigReqExtensionInit(void)
{ {
AddExtension(XBigReqExtensionName, 0, 0, AddExtension(XBigReqExtensionName, 0, 0,
ProcBigReqDispatch, ProcBigReqDispatch, ProcBigReqDispatch, ProcBigReqDispatch,

2
Xext/dpms.c
View File

@ -355,7 +355,7 @@ SProcDPMSDispatch(ClientPtr client)
} }
void void
DPMSExtensionInit(INITARGS) DPMSExtensionInit(void)
{ {
AddExtension(DPMSExtensionName, 0, 0, AddExtension(DPMSExtensionName, 0, 0,
ProcDPMSDispatch, SProcDPMSDispatch, ProcDPMSDispatch, SProcDPMSDispatch,

2
Xext/saver.c
View File

@ -1389,7 +1389,7 @@ SProcScreenSaverDispatch(ClientPtr client)
} }
void void
ScreenSaverExtensionInit(INITARGS) ScreenSaverExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
int i; int i;

2
Xext/security.c
View File

@ -1027,7 +1027,7 @@ SecurityResetProc(ExtensionEntry * extEntry)
*/ */
void void
SecurityExtensionInit(INITARGS) SecurityExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
int ret = TRUE; int ret = TRUE;

2
Xext/shm.c
View File

@ -1248,7 +1248,7 @@ SProcShmDispatch(ClientPtr client)
} }
void void
ShmExtensionInit(INITARGS) ShmExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
int i; int i;

2
Xext/xcmisc.c
View File

@ -190,7 +190,7 @@ SProcXCMiscDispatch(ClientPtr client)
} }
void void
XCMiscExtensionInit(INITARGS) XCMiscExtensionInit(void)
{ {
AddExtension(XCMiscExtensionName, 0, 0, AddExtension(XCMiscExtensionName, 0, 0,
ProcXCMiscDispatch, SProcXCMiscDispatch, ProcXCMiscDispatch, SProcXCMiscDispatch,

2
Xext/xres.c
View File

@ -1184,7 +1184,7 @@ SProcResDispatch (ClientPtr client)
} }
void void
ResExtensionInit(INITARGS) ResExtensionInit(void)
{ {
(void) AddExtension(XRES_NAME, 0, 0, (void) AddExtension(XRES_NAME, 0, 0,
ProcResDispatch, SProcResDispatch, ProcResDispatch, SProcResDispatch,

2
Xext/xselinux_ext.c
View File

@ -687,7 +687,7 @@ SELinuxResetProc(ExtensionEntry * extEntry)
} }
void void
SELinuxExtensionInit(INITARGS) SELinuxExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;

2
Xext/xtest.c
View File

@ -679,7 +679,7 @@ XTestExtensionTearDown(ExtensionEntry * e)
} }
void void
XTestExtensionInit(INITARGS) XTestExtensionInit(void)
{ {
AddExtension(XTestExtensionName, 0, 0, AddExtension(XTestExtensionName, 0, 0,
ProcXTestDispatch, SProcXTestDispatch, ProcXTestDispatch, SProcXTestDispatch,

2
hw/xfree86/common/xf86Module.h
View File

@ -171,7 +171,7 @@ typedef struct {
#define INITARGS void #define INITARGS void
typedef void (*InitExtension) (INITARGS); typedef void (*InitExtension) (void);
typedef struct { typedef struct {
InitExtension initFunc; InitExtension initFunc;

2
hw/xfree86/dixmods/dbemodule.c
View File

@ -7,7 +7,7 @@
static MODULESETUPPROTO(dbeSetup); static MODULESETUPPROTO(dbeSetup);
extern void DbeExtensionInit(INITARGS); extern void DbeExtensionInit(void);
static ExtensionModule dbeExt = { static ExtensionModule dbeExt = {
DbeExtensionInit, DbeExtensionInit,

49
hw/xfree86/dixmods/extmod/modinit.h
View File

@ -3,91 +3,78 @@
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifndef INITARGS
#define INITARGS void
#endif
#include <X11/extensions/shapeproto.h> #include <X11/extensions/shapeproto.h>
#ifdef XTEST #ifdef XTEST
extern void XTestExtensionInit(INITARGS); extern void XTestExtensionInit(void);
#include <X11/extensions/xtestproto.h> #include <X11/extensions/xtestproto.h>
#endif #endif
#if 1 #if 1
extern void XTestExtension1Init(INITARGS); extern void XTestExtension1Init(void);
#endif #endif
#if 1 #if 1
extern void XCMiscExtensionInit(INITARGS); extern void XCMiscExtensionInit(void);
#endif #endif
#ifdef SCREENSAVER #ifdef SCREENSAVER
extern void ScreenSaverExtensionInit(INITARGS); extern void ScreenSaverExtensionInit(void);
#include <X11/extensions/saver.h> #include <X11/extensions/saver.h>
#endif #endif
#ifdef XF86VIDMODE #ifdef XF86VIDMODE
extern void XFree86VidModeExtensionInit(INITARGS); extern void XFree86VidModeExtensionInit(void);
#include <X11/extensions/xf86vmproto.h> #include <X11/extensions/xf86vmproto.h>
#endif #endif
#ifdef XFreeXDGA #ifdef XFreeXDGA
extern void XFree86DGAExtensionInit(INITARGS); extern void XFree86DGAExtensionInit(void);
extern void XFree86DGARegister(INITARGS); extern void XFree86DGARegister(void);
#include <X11/extensions/xf86dgaproto.h> #include <X11/extensions/xf86dgaproto.h>
#endif #endif
#ifdef DPMSExtension #ifdef DPMSExtension
extern void DPMSExtensionInit(INITARGS); extern void DPMSExtensionInit(void);
#include <X11/extensions/dpmsconst.h> #include <X11/extensions/dpmsconst.h>
#endif #endif
#ifdef XV #ifdef XV
extern void XvExtensionInit(INITARGS); extern void XvExtensionInit(void);
extern void XvMCExtensionInit(INITARGS); extern void XvMCExtensionInit(void);
extern void XvRegister(INITARGS); extern void XvRegister(void);
#include <X11/extensions/Xv.h> #include <X11/extensions/Xv.h>
#include <X11/extensions/XvMC.h> #include <X11/extensions/XvMC.h>
#endif #endif
#ifdef RES #ifdef RES
extern void ResExtensionInit(INITARGS); extern void ResExtensionInit(void);
#include <X11/extensions/XResproto.h> #include <X11/extensions/XResproto.h>
#endif #endif
#ifdef SHM #ifdef SHM
extern void ShmExtensionInit(INITARGS);
#include <X11/extensions/shmproto.h> #include <X11/extensions/shmproto.h>
extern void ShmExtensionInit(void);
extern void ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs); extern void ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
#endif #endif
#ifdef XSELINUX #ifdef XSELINUX
extern void SELinuxExtensionInit(INITARGS); extern void SELinuxExtensionInit(void);
#include "xselinux.h" #include "xselinux.h"
#endif #endif
#ifdef XEVIE #ifdef XEVIE
extern void XevieExtensionInit(INITARGS); extern void XevieExtensionInit(void);
#endif #endif
#if 1 #if 1
extern void SecurityExtensionInit(INITARGS); extern void SecurityExtensionInit(void);
#endif #endif
#if 1 #if 1
extern void PanoramiXExtensionInit(INITARGS); extern void PanoramiXExtensionInit(void);
#endif #endif
#if 1 #if 1
extern void XkbExtensionInit(INITARGS); extern void XkbExtensionInit(void);
#endif #endif

4
hw/xfree86/dixmods/extmod/xf86dga2.c
View File

@ -1010,13 +1010,13 @@ ProcXDGADispatch(ClientPtr client)
} }
void void
XFree86DGARegister(INITARGS) XFree86DGARegister(void)
{ {
XDGAEventBase = &DGAEventBase; XDGAEventBase = &DGAEventBase;
} }
void void
XFree86DGAExtensionInit(INITARGS) XFree86DGAExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;

2
hw/xfree86/dixmods/recordmod.c
View File

@ -8,7 +8,7 @@ extern Bool noTestExtensions;
static MODULESETUPPROTO(recordSetup); static MODULESETUPPROTO(recordSetup);
extern void RecordExtensionInit(INITARGS); extern void RecordExtensionInit(void);
static ExtensionModule recordExt = { static ExtensionModule recordExt = {
RecordExtensionInit, RecordExtensionInit,

3
hw/xfree86/dri/drimodule.c
View File

@ -57,8 +57,7 @@ static XF86ModuleVersionInfo VersRec = {
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
extern void XFree86DRIExtensionInit(INITARGS); extern void XFree86DRIExtensionInit(void);
#define _XF86DRI_SERVER_ #define _XF86DRI_SERVER_
#include <X11/dri/xf86driproto.h> #include <X11/dri/xf86driproto.h>

67
mi/miinitext.c
View File

@ -96,8 +96,7 @@ SOFTWARE.
extern Bool noGEExtension; extern Bool noGEExtension;
#ifndef XFree86LOADER #ifndef XFree86LOADER
#define INITARGS void typedef void (*InitExtension) (void);
typedef void (*InitExtension) (INITARGS);
#else /* XFree86Loader */ #else /* XFree86Loader */
#include "loaderProcs.h" #include "loaderProcs.h"
#endif #endif
@ -128,84 +127,80 @@ typedef void (*InitExtension) (INITARGS);
/* FIXME: this whole block of externs should be from the appropriate headers */ /* FIXME: this whole block of externs should be from the appropriate headers */
#ifdef MITSHM #ifdef MITSHM
extern void ShmExtensionInit(INITARGS); extern void ShmExtensionInit(void);
#endif #endif
#ifdef PANORAMIX #ifdef PANORAMIX
extern void PanoramiXExtensionInit(INITARGS); extern void PanoramiXExtensionInit(void);
#endif #endif
#ifdef INXQUARTZ #ifdef INXQUARTZ
extern void PseudoramiXExtensionInit(INITARGS); extern void PseudoramiXExtensionInit(void);
#endif #endif
extern void XInputExtensionInit(INITARGS); extern void XInputExtensionInit(void);
#ifdef XTEST #ifdef XTEST
extern void XTestExtensionInit(INITARGS); extern void XTestExtensionInit(void);
#endif #endif
extern void BigReqExtensionInit(INITARGS); extern void BigReqExtensionInit(void);
#ifdef SCREENSAVER #ifdef SCREENSAVER
extern void ScreenSaverExtensionInit(INITARGS); extern void ScreenSaverExtensionInit(void);
#endif #endif
#ifdef XV #ifdef XV
extern void XvExtensionInit(INITARGS); extern void XvExtensionInit(void);
extern void XvMCExtensionInit(INITARGS); extern void XvMCExtensionInit(void);
#endif #endif
extern void SyncExtensionInit(INITARGS); extern void SyncExtensionInit(void);
extern void XkbExtensionInit(INITARGS); extern void XkbExtensionInit(void);
extern void XCMiscExtensionInit(INITARGS); extern void XCMiscExtensionInit(void);
#ifdef XRECORD #ifdef XRECORD
extern void RecordExtensionInit(INITARGS); extern void RecordExtensionInit(void);
#endif #endif
#ifdef DBE #ifdef DBE
extern void DbeExtensionInit(INITARGS); extern void DbeExtensionInit(void);
#endif #endif
#ifdef XCSECURITY #ifdef XCSECURITY
extern void SecurityExtensionInit(INITARGS); extern void SecurityExtensionInit(void);
#endif #endif
#ifdef XSELINUX #ifdef XSELINUX
extern void SELinuxExtensionInit(INITARGS); extern void SELinuxExtensionInit(void);
#endif #endif
#ifdef XF86BIGFONT #ifdef XF86BIGFONT
extern void XFree86BigfontExtensionInit(INITARGS); extern void XFree86BigfontExtensionInit(void);
#endif #endif
#ifdef XF86VIDMODE #ifdef XF86VIDMODE
extern void XFree86VidModeExtensionInit(INITARGS); extern void XFree86VidModeExtensionInit(void);
#endif #endif
#ifdef XFreeXDGA #ifdef XFreeXDGA
extern void XFree86DGAExtensionInit(INITARGS); extern void XFree86DGAExtensionInit(void);
#endif #endif
#ifdef GLXEXT #ifdef GLXEXT
typedef struct __GLXprovider __GLXprovider; typedef struct __GLXprovider __GLXprovider;
extern __GLXprovider __glXDRISWRastProvider; extern __GLXprovider __glXDRISWRastProvider;
extern void GlxPushProvider(__GLXprovider * impl); extern void GlxPushProvider(__GLXprovider *impl);
extern void GlxExtensionInit(INITARGS); extern void GlxExtensionInit(void);
#endif #endif
#ifdef XF86DRI #ifdef XF86DRI
extern void XFree86DRIExtensionInit(INITARGS); extern void XFree86DRIExtensionInit(void);
#endif #endif
#ifdef DPMSExtension #ifdef DPMSExtension
extern void DPMSExtensionInit(INITARGS); extern void DPMSExtensionInit(void);
#endif #endif
extern void RenderExtensionInit(INITARGS); extern void RenderExtensionInit(void);
#ifdef RANDR #ifdef RANDR
extern void RRExtensionInit(INITARGS); extern void RRExtensionInit(void);
#endif #endif
#ifdef RES #ifdef RES
extern void ResExtensionInit(INITARGS); extern void ResExtensionInit(void);
#endif #endif
#ifdef DMXEXT #ifdef DMXEXT
extern void DMXExtensionInit(INITARGS); extern void DMXExtensionInit(void);
#endif #endif
#ifdef XFIXES #ifdef XFIXES
extern void XFixesExtensionInit(INITARGS); extern void XFixesExtensionInit(void);
#endif #endif
#ifdef DAMAGE #ifdef DAMAGE
extern void DamageExtensionInit(INITARGS); extern void DamageExtensionInit(void);
#endif #endif
#ifdef COMPOSITE #ifdef COMPOSITE
extern void CompositeExtensionInit(INITARGS); extern void CompositeExtensionInit(void);
#endif #endif
/* The following is only a small first step towards run-time /* The following is only a small first step towards run-time