xfree86: ANSI cleanups

19 files changed, 56 insertions, 62 deletions

diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index e0e3cb4b5..1f8e4debb 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -1936,7 +1936,7 @@ checkRequiredResources(int entityIndex)
 }
 
 void
-xf86PostPreInit()
+xf86PostPreInit(void)
 {
   if (doFramebufferMode) return;
 
@@ -2370,7 +2370,7 @@ xf86ExtractTypeFromList(resPtr list, unsigned long type)
  * was active when the server was started.
  */
 void
-xf86FindPrimaryDevice()
+xf86FindPrimaryDevice(void)
 {
     if (primaryBus.type != BUS_NONE) {
 	char *bus;
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index a8b568f7f..bb6789846 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -362,7 +362,7 @@ xf86ModulelistFromConfig(pointer **optlist)
 
 
 char **
-xf86DriverlistFromConfig()
+xf86DriverlistFromConfig(void)
 {
     int count = 0;
     int j;
@@ -434,7 +434,7 @@ xf86DriverlistFromConfig()
 }
 
 char **
-xf86InputDriverlistFromConfig()
+xf86InputDriverlistFromConfig(void)
 {
     int count = 0;
     char **modulearray;
diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index bbb87929f..9c701c5d0 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -568,7 +568,7 @@ DGAActive(int index)
 /* Called by the event code in case the server is abruptly terminated */
 
 void
-DGAShutdown()
+DGAShutdown(void)
 {
     ScrnInfoPtr pScrn;
     int i;
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index c7f6c88f3..1babf126e 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -142,7 +142,7 @@ LegalModifier(unsigned int key, DeviceIntPtr pDev)
  *      time in milliseconds since there last was any input.
  */
 int
-TimeSinceLastInputEvent()
+TimeSinceLastInputEvent(void)
 {
   if (xf86Info.lastEventTime == 0) {
     xf86Info.lastEventTime = GetTimeInMillis();
@@ -155,7 +155,7 @@ TimeSinceLastInputEvent()
  *      Set the lastEventTime to now.
  */
 void
-SetTimeSinceLastInputEvent()
+SetTimeSinceLastInputEvent(void)
 {
   xf86Info.lastEventTime = GetTimeInMillis();
 }
@@ -167,7 +167,7 @@ SetTimeSinceLastInputEvent()
  *      and keyboard.
  */
 void
-ProcessInputEvents ()
+ProcessInputEvents (void)
 {
   int x, y;
 
@@ -464,7 +464,7 @@ xf86ReleaseKeys(DeviceIntPtr pDev)
  *      Handle requests for switching the vt.
  */
 static void
-xf86VTSwitch()
+xf86VTSwitch(void)
 {
   int i, prevSIGIO;
   InputInfoPtr pInfo;
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 78df06013..9aeba27c1 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -1341,7 +1341,7 @@ xf86ErrorF(const char *format, ...)
 
 
 void
-xf86LogInit()
+xf86LogInit(void)
 {
     char *lf = NULL;
 
@@ -1372,7 +1372,7 @@ xf86LogInit()
 }
 
 void
-xf86CloseLog()
+xf86CloseLog(void)
 {
     LogClose();
 }
@@ -2088,69 +2088,69 @@ xf86GetVisualName(int visual)
 
 
 int
-xf86GetVerbosity()
+xf86GetVerbosity(void)
 {
     return max(xf86Verbose, xf86LogVerbose);
 }
 
 Pix24Flags
-xf86GetPix24()
+xf86GetPix24(void)
 {
     return xf86Info.pixmap24;
 }
 
 
 int
-xf86GetDepth()
+xf86GetDepth(void)
 {
     return xf86Depth;
 }
 
 
 rgb
-xf86GetWeight()
+xf86GetWeight(void)
 {
     return xf86Weight;
 }
 
 
 Gamma
-xf86GetGamma()
+xf86GetGamma(void)
 {
     return xf86Gamma;
 }
 
 
 Bool
-xf86GetFlipPixels()
+xf86GetFlipPixels(void)
 {
     return xf86FlipPixels;
 }
 
 
 const char *
-xf86GetServerName()
+xf86GetServerName(void)
 {
     return xf86ServerName;
 }
 
 
 Bool
-xf86ServerIsExiting()
+xf86ServerIsExiting(void)
 {
     return (dispatchException & DE_TERMINATE) == DE_TERMINATE;
 }
 
 
 Bool
-xf86ServerIsResetting()
+xf86ServerIsResetting(void)
 {
     return xf86Resetting;
 }
 
 
 Bool
-xf86ServerIsInitialising()
+xf86ServerIsInitialising(void)
 {
     return xf86Initialising;
 }
@@ -2171,48 +2171,48 @@ xf86ServerIsOnlyProbing(void)
 
 
 Bool
-xf86CaughtSignal()
+xf86CaughtSignal(void)
 {
     return xf86Info.caughtSignal;
 }
 
 
 Bool
-xf86GetVidModeAllowNonLocal()
+xf86GetVidModeAllowNonLocal(void)
 {
     return xf86Info.vidModeAllowNonLocal;
 }
 
 
 Bool
-xf86GetVidModeEnabled()
+xf86GetVidModeEnabled(void)
 {
     return xf86Info.vidModeEnabled;
 }
 
 Bool
-xf86GetModInDevAllowNonLocal()
+xf86GetModInDevAllowNonLocal(void)
 {
     return xf86Info.miscModInDevAllowNonLocal;
 }
 
 
 Bool
-xf86GetModInDevEnabled()
+xf86GetModInDevEnabled(void)
 {
     return xf86Info.miscModInDevEnabled;
 }
 
 
 Bool
-xf86GetAllowMouseOpenFail()
+xf86GetAllowMouseOpenFail(void)
 {
     return xf86Info.allowMouseOpenFail;
 }
 
 
 Bool
-xf86IsPc98()
+xf86IsPc98(void)
 {
 #ifdef __i386__
     return xf86Info.pc98;
@@ -2222,7 +2222,7 @@ xf86IsPc98()
 }
 
 void
-xf86DisableRandR()
+xf86DisableRandR(void)
 {
     xf86Info.disableRandR = TRUE;
     xf86Info.randRFrom = X_PROBED;
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 542695c25..97b703d31 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1292,9 +1292,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
  */
 
 void
-InitInput(argc, argv)
-     int	  argc;
-     char	  **argv;
+InitInput(int argc, char **argv)
 {
     IDevPtr* pDev;
     DeviceIntPtr dev;
@@ -1323,7 +1321,7 @@ InitInput(argc, argv)
  */
 
 void
-OsVendorInit()
+OsVendorInit(void)
 {
   static Bool beenHere = FALSE;
 
@@ -1368,7 +1366,7 @@ OsVendorInit()
  */
 
 void
-ddxGiveUp()
+ddxGiveUp(void)
 {
     int i;
 
@@ -1413,7 +1411,7 @@ ddxGiveUp()
  */
 
 void
-AbortDDX()
+AbortDDX(void)
 {
   int i;
 
@@ -1449,7 +1447,7 @@ AbortDDX()
 }
 
 void
-OsVendorFatalError()
+OsVendorFatalError(void)
 {
 #ifdef VENDORSUPPORT
     ErrorF("\nPlease refer to your Operating System Vendor support pages\n"
@@ -1841,7 +1839,7 @@ ddxProcessArgument(int argc, char **argv, int i)
  */
 
 void
-ddxUseMsg()
+ddxUseMsg(void)
 {
   ErrorF("\n");
   ErrorF("\n");
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index e8acf392a..582c72206 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -476,7 +476,7 @@ ChangeDeviceControl (ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control)
 }
 
 void
-AddOtherInputDevices()
+AddOtherInputDevices(void)
 {
 }
 
@@ -941,7 +941,7 @@ xf86PostKeyboardEvent(DeviceIntPtr      device,
 }
 
 LocalDevicePtr
-xf86FirstLocalDevice()
+xf86FirstLocalDevice(void)
 {
     return xf86InputDevs;
 }
diff --git a/hw/xfree86/common/xorgHelper.c b/hw/xfree86/common/xorgHelper.c
index 7f9dd507a..7a8e5167d 100644
--- a/hw/xfree86/common/xorgHelper.c
+++ b/hw/xfree86/common/xorgHelper.c
@@ -17,7 +17,7 @@
 
 
 CARD32
-xorgGetVersion()
+xorgGetVersion(void)
 {
     return XORG_VERSION_CURRENT;
 }
diff --git a/hw/xfree86/dixmods/extmod/xvmod.c b/hw/xfree86/dixmods/extmod/xvmod.c
index 6b3f1149a..955104679 100644
--- a/hw/xfree86/dixmods/extmod/xvmod.c
+++ b/hw/xfree86/dixmods/extmod/xvmod.c
@@ -13,7 +13,7 @@
 #include "xvmodproc.h"
 
 void
-XvRegister()
+XvRegister(void)
 {
     XvScreenInitProc = XvScreenInit;
     XvGetScreenKeyProc = XvGetScreenKey;
diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c
index 231daf88a..dad44d827 100644
--- a/hw/xfree86/loader/loader.c
+++ b/hw/xfree86/loader/loader.c
@@ -153,7 +153,7 @@ LoaderInit(void)
 static loaderPtr listHead = (loaderPtr) 0;
 
 static loaderPtr
-_LoaderListPush()
+_LoaderListPush(void)
 {
     loaderPtr item = calloc(1, sizeof(struct _loader));
 
diff --git a/hw/xfree86/loader/loadext.c b/hw/xfree86/loader/loadext.c
index c4033643b..a61b28cc2 100644
--- a/hw/xfree86/loader/loadext.c
+++ b/hw/xfree86/loader/loadext.c
@@ -387,7 +387,7 @@ tsort(void)
 }
 
 void
-LoaderSortExtensions()
+LoaderSortExtensions(void)
 {
     int i, j;
     ExtensionModule *ext, *newList;
diff --git a/hw/xfree86/os-support/linux/lnx_agp.c b/hw/xfree86/os-support/linux/lnx_agp.c
index 4c1722fef..e5eb30c92 100644
--- a/hw/xfree86/os-support/linux/lnx_agp.c
+++ b/hw/xfree86/os-support/linux/lnx_agp.c
@@ -117,7 +117,7 @@ GARTInit(int screenNum)
 }
 
 Bool
-xf86AgpGARTSupported()
+xf86AgpGARTSupported(void)
 {
 	return GARTInit(-1);
 }
diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
index 6ee8ed6bd..0ac97e891 100644
--- a/hw/xfree86/os-support/linux/lnx_init.c
+++ b/hw/xfree86/os-support/linux/lnx_init.c
@@ -348,7 +348,7 @@ xf86OpenConsole(void)
 }
 
 void
-xf86CloseConsole()
+xf86CloseConsole(void)
 {
     struct vt_mode   VT;
 #if defined(DO_OS_FONTRESTORE)
@@ -457,7 +457,7 @@ xf86ProcessArgument(int argc, char *argv[], int i)
 }
 
 void
-xf86UseMsg()
+xf86UseMsg(void)
 {
 	ErrorF("vtXX                   use the specified VT number\n");
 	ErrorF("-keeptty               ");
diff --git a/hw/xfree86/os-support/shared/VTsw_usl.c b/hw/xfree86/os-support/shared/VTsw_usl.c
index 4d473147f..9308640e2 100644
--- a/hw/xfree86/os-support/shared/VTsw_usl.c
+++ b/hw/xfree86/os-support/shared/VTsw_usl.c
@@ -53,13 +53,13 @@ xf86VTRequest(int sig)
 }
 
 Bool
-xf86VTSwitchPending()
+xf86VTSwitchPending(void)
 {
     return(xf86Info.vtRequestsPending ? TRUE : FALSE);
 }
 
 Bool
-xf86VTSwitchAway()
+xf86VTSwitchAway(void)
 {
 	xf86Info.vtRequestsPending = FALSE;
 	if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0)
@@ -76,7 +76,7 @@ xf86VTSwitchAway()
 }
 
 Bool
-xf86VTSwitchTo()
+xf86VTSwitchTo(void)
 {
 	xf86Info.vtRequestsPending = FALSE;
 	if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0)
diff --git a/hw/xfree86/os-support/shared/vidmem.c b/hw/xfree86/os-support/shared/vidmem.c
index f8a488a56..803ce09bd 100644
--- a/hw/xfree86/os-support/shared/vidmem.c
+++ b/hw/xfree86/os-support/shared/vidmem.c
@@ -275,7 +275,7 @@ xf86CheckMTRR(int ScreenNum)
 }
 
 Bool
-xf86LinearVidMem()
+xf86LinearVidMem(void)
 {
 	xf86InitVidMem();
 	return vidMemInfo.linearSupported;
diff --git a/hw/xfree86/ramdac/xf86RamDac.c b/hw/xfree86/ramdac/xf86RamDac.c
index 70c752e28..bd4f3466a 100644
--- a/hw/xfree86/ramdac/xf86RamDac.c
+++ b/hw/xfree86/ramdac/xf86RamDac.c
@@ -37,7 +37,7 @@ int RamDacHWPrivateIndex = -1;
 int RamDacScreenPrivateIndex = -1;
 
 RamDacRecPtr
-RamDacCreateInfoRec()
+RamDacCreateInfoRec(void)
 {
     RamDacRecPtr infoRec;
 
@@ -47,7 +47,7 @@ RamDacCreateInfoRec()
 }
 
 RamDacHelperRecPtr
-RamDacHelperCreateInfoRec()
+RamDacHelperCreateInfoRec(void)
 {
     RamDacHelperRecPtr infoRec;
 
@@ -86,7 +86,7 @@ RamDacInit(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPriv)
 }
 
 void
-RamDacGetRecPrivate()
+RamDacGetRecPrivate(void)
 {
     if (RamDacHWPrivateIndex < 0)
 	RamDacHWPrivateIndex = xf86AllocateScrnInfoPrivateIndex();
@@ -142,13 +142,13 @@ RamDacFreeRec(ScrnInfoPtr pScrn)
 }
 
 int
-RamDacGetHWIndex()
+RamDacGetHWIndex(void)
 {
     return RamDacHWPrivateIndex;
 }
 
 int
-RamDacGetScreenIndex()
+RamDacGetScreenIndex(void)
 {
     return RamDacScreenPrivateIndex;
 }
diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c
index 1c278d119..9d466e3dc 100644
--- a/hw/xfree86/vgahw/vgaHW.c
+++ b/hw/xfree86/vgahw/vgaHW.c
@@ -1798,7 +1798,7 @@ vgaHWUnmapMem(ScrnInfoPtr scrp)
 }
 
 int
-vgaHWGetIndex()
+vgaHWGetIndex(void)
 {
     return vgaHWPrivateIndex;
 }
diff --git a/hw/xfree86/xaa/xaaFillArc.c b/hw/xfree86/xaa/xaaFillArc.c
index d3ebc22fc..d83922ce0 100644
--- a/hw/xfree86/xaa/xaaFillArc.c
+++ b/hw/xfree86/xaa/xaaFillArc.c
@@ -161,11 +161,7 @@ XAAFillArcSliceSolid(DrawablePtr pDraw, GCPtr pGC, xArc *arc)
 
 
 void
-XAAPolyFillArcSolid(pDraw, pGC, narcs, parcs)
-    DrawablePtr	pDraw;
-    GCPtr	pGC;
-    int		narcs;
-    xArc	*parcs;
+XAAPolyFillArcSolid(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs)
 {
     register xArc *arc;
     register int i;
diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c
index 326da6149..2ce2d9085 100644
--- a/hw/xfree86/xaa/xaaInit.c
+++ b/hw/xfree86/xaa/xaaInit.c
@@ -65,7 +65,7 @@ DevPrivateKey XAAGetPixmapKey(void) {
 static Bool SwitchedOut = FALSE;
 
 XAAInfoRecPtr
-XAACreateInfoRec()
+XAACreateInfoRec(void)
 {
     XAAInfoRecPtr infoRec;