xfree86: ANSI cleanups

This commit is contained in:
Julien Cristau 2009-01-11 08:33:18 +01:00
parent dba3b1944d
commit aec4c0caca
19 changed files with 56 additions and 62 deletions

View File

@ -1936,7 +1936,7 @@ checkRequiredResources(int entityIndex)
} }
void void
xf86PostPreInit() xf86PostPreInit(void)
{ {
if (doFramebufferMode) return; if (doFramebufferMode) return;
@ -2370,7 +2370,7 @@ xf86ExtractTypeFromList(resPtr list, unsigned long type)
* was active when the server was started. * was active when the server was started.
*/ */
void void
xf86FindPrimaryDevice() xf86FindPrimaryDevice(void)
{ {
if (primaryBus.type != BUS_NONE) { if (primaryBus.type != BUS_NONE) {
char *bus; char *bus;

View File

@ -362,7 +362,7 @@ xf86ModulelistFromConfig(pointer **optlist)
char ** char **
xf86DriverlistFromConfig() xf86DriverlistFromConfig(void)
{ {
int count = 0; int count = 0;
int j; int j;
@ -434,7 +434,7 @@ xf86DriverlistFromConfig()
} }
char ** char **
xf86InputDriverlistFromConfig() xf86InputDriverlistFromConfig(void)
{ {
int count = 0; int count = 0;
char **modulearray; char **modulearray;

View File

@ -568,7 +568,7 @@ DGAActive(int index)
/* Called by the event code in case the server is abruptly terminated */ /* Called by the event code in case the server is abruptly terminated */
void void
DGAShutdown() DGAShutdown(void)
{ {
ScrnInfoPtr pScrn; ScrnInfoPtr pScrn;
int i; int i;

View File

@ -142,7 +142,7 @@ LegalModifier(unsigned int key, DeviceIntPtr pDev)
* time in milliseconds since there last was any input. * time in milliseconds since there last was any input.
*/ */
int int
TimeSinceLastInputEvent() TimeSinceLastInputEvent(void)
{ {
if (xf86Info.lastEventTime == 0) { if (xf86Info.lastEventTime == 0) {
xf86Info.lastEventTime = GetTimeInMillis(); xf86Info.lastEventTime = GetTimeInMillis();
@ -155,7 +155,7 @@ TimeSinceLastInputEvent()
* Set the lastEventTime to now. * Set the lastEventTime to now.
*/ */
void void
SetTimeSinceLastInputEvent() SetTimeSinceLastInputEvent(void)
{ {
xf86Info.lastEventTime = GetTimeInMillis(); xf86Info.lastEventTime = GetTimeInMillis();
} }
@ -167,7 +167,7 @@ SetTimeSinceLastInputEvent()
* and keyboard. * and keyboard.
*/ */
void void
ProcessInputEvents () ProcessInputEvents (void)
{ {
int x, y; int x, y;
@ -464,7 +464,7 @@ xf86ReleaseKeys(DeviceIntPtr pDev)
* Handle requests for switching the vt. * Handle requests for switching the vt.
*/ */
static void static void
xf86VTSwitch() xf86VTSwitch(void)
{ {
int i, prevSIGIO; int i, prevSIGIO;
InputInfoPtr pInfo; InputInfoPtr pInfo;

View File

@ -1341,7 +1341,7 @@ xf86ErrorF(const char *format, ...)
void void
xf86LogInit() xf86LogInit(void)
{ {
char *lf = NULL; char *lf = NULL;
@ -1372,7 +1372,7 @@ xf86LogInit()
} }
void void
xf86CloseLog() xf86CloseLog(void)
{ {
LogClose(); LogClose();
} }
@ -2088,69 +2088,69 @@ xf86GetVisualName(int visual)
int int
xf86GetVerbosity() xf86GetVerbosity(void)
{ {
return max(xf86Verbose, xf86LogVerbose); return max(xf86Verbose, xf86LogVerbose);
} }
Pix24Flags Pix24Flags
xf86GetPix24() xf86GetPix24(void)
{ {
return xf86Info.pixmap24; return xf86Info.pixmap24;
} }
int int
xf86GetDepth() xf86GetDepth(void)
{ {
return xf86Depth; return xf86Depth;
} }
rgb rgb
xf86GetWeight() xf86GetWeight(void)
{ {
return xf86Weight; return xf86Weight;
} }
Gamma Gamma
xf86GetGamma() xf86GetGamma(void)
{ {
return xf86Gamma; return xf86Gamma;
} }
Bool Bool
xf86GetFlipPixels() xf86GetFlipPixels(void)
{ {
return xf86FlipPixels; return xf86FlipPixels;
} }
const char * const char *
xf86GetServerName() xf86GetServerName(void)
{ {
return xf86ServerName; return xf86ServerName;
} }
Bool Bool
xf86ServerIsExiting() xf86ServerIsExiting(void)
{ {
return (dispatchException & DE_TERMINATE) == DE_TERMINATE; return (dispatchException & DE_TERMINATE) == DE_TERMINATE;
} }
Bool Bool
xf86ServerIsResetting() xf86ServerIsResetting(void)
{ {
return xf86Resetting; return xf86Resetting;
} }
Bool Bool
xf86ServerIsInitialising() xf86ServerIsInitialising(void)
{ {
return xf86Initialising; return xf86Initialising;
} }
@ -2171,48 +2171,48 @@ xf86ServerIsOnlyProbing(void)
Bool Bool
xf86CaughtSignal() xf86CaughtSignal(void)
{ {
return xf86Info.caughtSignal; return xf86Info.caughtSignal;
} }
Bool Bool
xf86GetVidModeAllowNonLocal() xf86GetVidModeAllowNonLocal(void)
{ {
return xf86Info.vidModeAllowNonLocal; return xf86Info.vidModeAllowNonLocal;
} }
Bool Bool
xf86GetVidModeEnabled() xf86GetVidModeEnabled(void)
{ {
return xf86Info.vidModeEnabled; return xf86Info.vidModeEnabled;
} }
Bool Bool
xf86GetModInDevAllowNonLocal() xf86GetModInDevAllowNonLocal(void)
{ {
return xf86Info.miscModInDevAllowNonLocal; return xf86Info.miscModInDevAllowNonLocal;
} }
Bool Bool
xf86GetModInDevEnabled() xf86GetModInDevEnabled(void)
{ {
return xf86Info.miscModInDevEnabled; return xf86Info.miscModInDevEnabled;
} }
Bool Bool
xf86GetAllowMouseOpenFail() xf86GetAllowMouseOpenFail(void)
{ {
return xf86Info.allowMouseOpenFail; return xf86Info.allowMouseOpenFail;
} }
Bool Bool
xf86IsPc98() xf86IsPc98(void)
{ {
#ifdef __i386__ #ifdef __i386__
return xf86Info.pc98; return xf86Info.pc98;
@ -2222,7 +2222,7 @@ xf86IsPc98()
} }
void void
xf86DisableRandR() xf86DisableRandR(void)
{ {
xf86Info.disableRandR = TRUE; xf86Info.disableRandR = TRUE;
xf86Info.randRFrom = X_PROBED; xf86Info.randRFrom = X_PROBED;

View File

@ -1292,9 +1292,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
*/ */
void void
InitInput(argc, argv) InitInput(int argc, char **argv)
int argc;
char **argv;
{ {
IDevPtr* pDev; IDevPtr* pDev;
DeviceIntPtr dev; DeviceIntPtr dev;
@ -1323,7 +1321,7 @@ InitInput(argc, argv)
*/ */
void void
OsVendorInit() OsVendorInit(void)
{ {
static Bool beenHere = FALSE; static Bool beenHere = FALSE;
@ -1368,7 +1366,7 @@ OsVendorInit()
*/ */
void void
ddxGiveUp() ddxGiveUp(void)
{ {
int i; int i;
@ -1413,7 +1411,7 @@ ddxGiveUp()
*/ */
void void
AbortDDX() AbortDDX(void)
{ {
int i; int i;
@ -1449,7 +1447,7 @@ AbortDDX()
} }
void void
OsVendorFatalError() OsVendorFatalError(void)
{ {
#ifdef VENDORSUPPORT #ifdef VENDORSUPPORT
ErrorF("\nPlease refer to your Operating System Vendor support pages\n" ErrorF("\nPlease refer to your Operating System Vendor support pages\n"
@ -1841,7 +1839,7 @@ ddxProcessArgument(int argc, char **argv, int i)
*/ */
void void
ddxUseMsg() ddxUseMsg(void)
{ {
ErrorF("\n"); ErrorF("\n");
ErrorF("\n"); ErrorF("\n");

View File

@ -476,7 +476,7 @@ ChangeDeviceControl (ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control)
} }
void void
AddOtherInputDevices() AddOtherInputDevices(void)
{ {
} }
@ -941,7 +941,7 @@ xf86PostKeyboardEvent(DeviceIntPtr device,
} }
LocalDevicePtr LocalDevicePtr
xf86FirstLocalDevice() xf86FirstLocalDevice(void)
{ {
return xf86InputDevs; return xf86InputDevs;
} }

View File

@ -17,7 +17,7 @@
CARD32 CARD32
xorgGetVersion() xorgGetVersion(void)
{ {
return XORG_VERSION_CURRENT; return XORG_VERSION_CURRENT;
} }

View File

@ -13,7 +13,7 @@
#include "xvmodproc.h" #include "xvmodproc.h"
void void
XvRegister() XvRegister(void)
{ {
XvScreenInitProc = XvScreenInit; XvScreenInitProc = XvScreenInit;
XvGetScreenKeyProc = XvGetScreenKey; XvGetScreenKeyProc = XvGetScreenKey;

View File

@ -153,7 +153,7 @@ LoaderInit(void)
static loaderPtr listHead = (loaderPtr) 0; static loaderPtr listHead = (loaderPtr) 0;
static loaderPtr static loaderPtr
_LoaderListPush() _LoaderListPush(void)
{ {
loaderPtr item = calloc(1, sizeof(struct _loader)); loaderPtr item = calloc(1, sizeof(struct _loader));

View File

@ -387,7 +387,7 @@ tsort(void)
} }
void void
LoaderSortExtensions() LoaderSortExtensions(void)
{ {
int i, j; int i, j;
ExtensionModule *ext, *newList; ExtensionModule *ext, *newList;

View File

@ -117,7 +117,7 @@ GARTInit(int screenNum)
} }
Bool Bool
xf86AgpGARTSupported() xf86AgpGARTSupported(void)
{ {
return GARTInit(-1); return GARTInit(-1);
} }

View File

@ -348,7 +348,7 @@ xf86OpenConsole(void)
} }
void void
xf86CloseConsole() xf86CloseConsole(void)
{ {
struct vt_mode VT; struct vt_mode VT;
#if defined(DO_OS_FONTRESTORE) #if defined(DO_OS_FONTRESTORE)
@ -457,7 +457,7 @@ xf86ProcessArgument(int argc, char *argv[], int i)
} }
void void
xf86UseMsg() xf86UseMsg(void)
{ {
ErrorF("vtXX use the specified VT number\n"); ErrorF("vtXX use the specified VT number\n");
ErrorF("-keeptty "); ErrorF("-keeptty ");

View File

@ -53,13 +53,13 @@ xf86VTRequest(int sig)
} }
Bool Bool
xf86VTSwitchPending() xf86VTSwitchPending(void)
{ {
return(xf86Info.vtRequestsPending ? TRUE : FALSE); return(xf86Info.vtRequestsPending ? TRUE : FALSE);
} }
Bool Bool
xf86VTSwitchAway() xf86VTSwitchAway(void)
{ {
xf86Info.vtRequestsPending = FALSE; xf86Info.vtRequestsPending = FALSE;
if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0) if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0)
@ -76,7 +76,7 @@ xf86VTSwitchAway()
} }
Bool Bool
xf86VTSwitchTo() xf86VTSwitchTo(void)
{ {
xf86Info.vtRequestsPending = FALSE; xf86Info.vtRequestsPending = FALSE;
if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0) if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0)

View File

@ -275,7 +275,7 @@ xf86CheckMTRR(int ScreenNum)
} }
Bool Bool
xf86LinearVidMem() xf86LinearVidMem(void)
{ {
xf86InitVidMem(); xf86InitVidMem();
return vidMemInfo.linearSupported; return vidMemInfo.linearSupported;

View File

@ -37,7 +37,7 @@ int RamDacHWPrivateIndex = -1;
int RamDacScreenPrivateIndex = -1; int RamDacScreenPrivateIndex = -1;
RamDacRecPtr RamDacRecPtr
RamDacCreateInfoRec() RamDacCreateInfoRec(void)
{ {
RamDacRecPtr infoRec; RamDacRecPtr infoRec;
@ -47,7 +47,7 @@ RamDacCreateInfoRec()
} }
RamDacHelperRecPtr RamDacHelperRecPtr
RamDacHelperCreateInfoRec() RamDacHelperCreateInfoRec(void)
{ {
RamDacHelperRecPtr infoRec; RamDacHelperRecPtr infoRec;
@ -86,7 +86,7 @@ RamDacInit(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPriv)
} }
void void
RamDacGetRecPrivate() RamDacGetRecPrivate(void)
{ {
if (RamDacHWPrivateIndex < 0) if (RamDacHWPrivateIndex < 0)
RamDacHWPrivateIndex = xf86AllocateScrnInfoPrivateIndex(); RamDacHWPrivateIndex = xf86AllocateScrnInfoPrivateIndex();
@ -142,13 +142,13 @@ RamDacFreeRec(ScrnInfoPtr pScrn)
} }
int int
RamDacGetHWIndex() RamDacGetHWIndex(void)
{ {
return RamDacHWPrivateIndex; return RamDacHWPrivateIndex;
} }
int int
RamDacGetScreenIndex() RamDacGetScreenIndex(void)
{ {
return RamDacScreenPrivateIndex; return RamDacScreenPrivateIndex;
} }

View File

@ -1798,7 +1798,7 @@ vgaHWUnmapMem(ScrnInfoPtr scrp)
} }
int int
vgaHWGetIndex() vgaHWGetIndex(void)
{ {
return vgaHWPrivateIndex; return vgaHWPrivateIndex;
} }

View File

@ -161,11 +161,7 @@ XAAFillArcSliceSolid(DrawablePtr pDraw, GCPtr pGC, xArc *arc)
void void
XAAPolyFillArcSolid(pDraw, pGC, narcs, parcs) XAAPolyFillArcSolid(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs)
DrawablePtr pDraw;
GCPtr pGC;
int narcs;
xArc *parcs;
{ {
register xArc *arc; register xArc *arc;
register int i; register int i;

View File

@ -65,7 +65,7 @@ DevPrivateKey XAAGetPixmapKey(void) {
static Bool SwitchedOut = FALSE; static Bool SwitchedOut = FALSE;
XAAInfoRecPtr XAAInfoRecPtr
XAACreateInfoRec() XAACreateInfoRec(void)
{ {
XAAInfoRecPtr infoRec; XAAInfoRecPtr infoRec;