Commit 1f6741db authored by Stefan Huehner's avatar Stefan Huehner Committed by Alan Coopersmith

Bug #10560: Code-Cleanup: function declarations () -> (void)

X.Org Bugzilla #10560: <https://bugs.freedesktop.org/show_bug.cgi?id=10560>
Patch #9511 <https://bugs.freedesktop.org/attachment.cgi?id=9511>
parent f24391db
......@@ -2509,7 +2509,7 @@ ServertimeBracketValues(pCounter, pbracket_less, pbracket_greater)
}
static void
SyncInitServerTime()
SyncInitServerTime(void)
{
CARD64 resolution;
......
......@@ -153,7 +153,7 @@ static int XvdiSendVideoNotify(XvPortPtr, DrawablePtr, int);
*/
void
XvExtensionInit()
XvExtensionInit(void)
{
ExtensionEntry *extEntry;
......@@ -205,7 +205,7 @@ XvExtensionInit()
}
static Bool
CreateResourceTypes()
CreateResourceTypes(void)
{
......@@ -335,13 +335,13 @@ XvResetProc(ExtensionEntry* extEntry)
}
_X_EXPORT int
XvGetScreenIndex()
XvGetScreenIndex(void)
{
return XvScreenIndex;
}
_X_EXPORT unsigned long
XvGetRTPort()
XvGetRTPort(void)
{
return XvRTPort;
}
......
......@@ -675,7 +675,7 @@ SProcXvMCDispatch (ClientPtr client)
}
void
XvMCExtensionInit()
XvMCExtensionInit(void)
{
ExtensionEntry *extEntry;
......
......@@ -410,13 +410,13 @@ configReconnect(OsTimerPtr timer, CARD32 time, pointer arg)
}
void
configInitialise()
configInitialise(void)
{
TimerSet(NULL, 0, 1, configReconnect, NULL);
}
void
configFini()
configFini(void)
{
DBusError error;
......
......@@ -167,7 +167,7 @@ NameForAtom(Atom atom)
}
void
AtomError()
AtomError(void)
{
FatalError("initializing atoms");
}
......@@ -185,7 +185,7 @@ FreeAtom(NodePtr patom)
}
void
FreeAllAtoms()
FreeAllAtoms(void)
{
if(atomRoot == (NodePtr)NULL)
return;
......@@ -197,7 +197,7 @@ FreeAllAtoms()
}
void
InitAtoms()
InitAtoms(void)
{
FreeAllAtoms();
tableLength = InitialTableSize;
......
......@@ -314,7 +314,7 @@ CorePointerProc(DeviceIntPtr pDev, int what)
}
void
InitCoreDevices()
InitCoreDevices(void)
{
DeviceIntPtr dev;
......@@ -373,7 +373,7 @@ InitCoreDevices()
}
int
InitAndStartDevices()
InitAndStartDevices(void)
{
DeviceIntPtr dev, next;
......@@ -503,7 +503,7 @@ CloseDevice(DeviceIntPtr dev)
}
void
CloseDownDevices()
CloseDownDevices(void)
{
DeviceIntPtr dev, next;
......@@ -580,7 +580,7 @@ RemoveDevice(DeviceIntPtr dev)
}
int
NumMotionEvents()
NumMotionEvents(void)
{
return inputInfo.pointer->valuator->numMotionEvents;
}
......@@ -598,13 +598,13 @@ RegisterKeyboardDevice(DeviceIntPtr device)
}
_X_EXPORT DevicePtr
LookupKeyboardDevice()
LookupKeyboardDevice(void)
{
return inputInfo.keyboard ? &inputInfo.keyboard->public : NULL;
}
_X_EXPORT DevicePtr
LookupPointerDevice()
LookupPointerDevice(void)
{
return inputInfo.pointer ? &inputInfo.pointer->public : NULL;
}
......
......@@ -218,7 +218,7 @@ SetInputCheck(HWEventQueuePtr c0, HWEventQueuePtr c1)
}
_X_EXPORT void
UpdateCurrentTime()
UpdateCurrentTime(void)
{
TimeStamp systime;
......@@ -237,7 +237,7 @@ UpdateCurrentTime()
/* Like UpdateCurrentTime, but can't call ProcessInputEvents */
_X_EXPORT void
UpdateCurrentTimeIf()
UpdateCurrentTimeIf(void)
{
TimeStamp systime;
......@@ -250,7 +250,7 @@ UpdateCurrentTimeIf()
}
void
InitSelections()
InitSelections(void)
{
if (CurrentSelections)
xfree(CurrentSelections);
......@@ -3654,7 +3654,7 @@ CloseDownClient(ClientPtr client)
}
static void
KillAllClients()
KillAllClients(void)
{
int i;
for (i=1; i<currentMaxClients; i++)
......
......@@ -1878,7 +1878,7 @@ DeleteClientFontStuff(ClientPtr client)
}
void
InitFonts ()
InitFonts (void)
{
patternCache = MakeFontPatternCache();
......@@ -1997,7 +1997,7 @@ RegisterFPEFunctions(NameCheckFunc name_func,
}
void
FreeFonts()
FreeFonts(void)
{
if (patternCache) {
FreeFontPatternCache(patternCache);
......
......@@ -550,7 +550,7 @@ RemoveBlockAndWakeupHandlers (BlockHandlerProcPtr blockHandler,
}
void
InitBlockAndWakeupHandlers ()
InitBlockAndWakeupHandlers (void)
{
xfree (handlers);
handlers = (BlockHandlerPtr) 0;
......@@ -950,7 +950,7 @@ DeleteCallbackList(CallbackListPtr *pcbl)
}
void
InitCallbackManager()
InitCallbackManager(void)
{
int i;
......
......@@ -844,7 +844,7 @@ ConfineCursorToWindow(WindowPtr pWin, Bool generateEvents, Bool confineToScreen)
}
_X_EXPORT Bool
PointerConfinedToScreen()
PointerConfinedToScreen(void)
{
return sprite.confined;
}
......@@ -913,19 +913,19 @@ PostNewCursor(void)
}
_X_EXPORT WindowPtr
GetCurrentRootWindow()
GetCurrentRootWindow(void)
{
return ROOT;
}
_X_EXPORT WindowPtr
GetSpriteWindow()
GetSpriteWindow(void)
{
return sprite.win;
}
_X_EXPORT CursorPtr
GetSpriteCursor()
GetSpriteCursor(void)
{
return sprite.current;
}
......@@ -939,7 +939,7 @@ GetSpritePosition(int *px, int *py)
#ifdef PANORAMIX
_X_EXPORT int
XineramaGetCursorScreen()
XineramaGetCursorScreen(void)
{
if(!noPanoramiXExtension) {
return sprite.screen->myNum;
......@@ -1114,7 +1114,7 @@ FreezeThaw(DeviceIntPtr dev, Bool frozen)
}
void
ComputeFreezes()
ComputeFreezes(void)
{
DeviceIntPtr replayDev = syncEvents.replayDev;
int i;
......@@ -2047,7 +2047,7 @@ CheckMotion(xEvent *xE)
}
_X_EXPORT void
WindowsRestructured()
WindowsRestructured(void)
{
(void) CheckMotion((xEvent *)NULL);
}
......@@ -3970,7 +3970,7 @@ ProcQueryPointer(ClientPtr client)
}
void
InitEvents()
InitEvents(void)
{
int i;
......
......@@ -278,7 +278,7 @@ MinorOpcodeOfRequest(ClientPtr client)
}
void
CloseDownExtensions()
CloseDownExtensions(void)
{
int i,j;
......
......@@ -73,7 +73,7 @@ extern Bool XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies);
* Pick some arbitrary size for Xi motion history.
*/
_X_EXPORT int
GetMotionHistorySize()
GetMotionHistorySize(void)
{
return MOTION_HISTORY_SIZE;
}
......@@ -183,7 +183,7 @@ updateMotionHistory(DeviceIntPtr pDev, CARD32 ms, int first_valuator,
* xEvent *events = xcalloc(sizeof(xEvent), GetMaximumEventsNum());
*/
_X_EXPORT int
GetMaximumEventsNum() {
GetMaximumEventsNum(void) {
/* Two base events -- core and device, plus valuator events. Multiply
* by two if we're doing key repeats. */
int ret = 2 + MAX_VALUATOR_EVENTS;
......
......@@ -11,7 +11,7 @@
#include <X11/Xatom.h>
#include "misc.h"
#include "dix.h"
void MakePredeclaredAtoms()
void MakePredeclaredAtoms(void)
{
if (MakeAtom("PRIMARY", 7, 1) != XA_PRIMARY) AtomError();
if (MakeAtom("SECONDARY", 9, 1) != XA_SECONDARY) AtomError();
......
......@@ -544,7 +544,7 @@ static int padlength[4] = {0, 3, 2, 1};
static
#endif
Bool
CreateConnectionBlock()
CreateConnectionBlock(void)
{
xConnSetup setup;
xWindowRoot root;
......
......@@ -60,7 +60,7 @@ unsigned *extensionPrivateSizes;
unsigned totalExtensionSize;
void
ResetExtensionPrivates()
ResetExtensionPrivates(void)
{
extensionPrivateCount = 0;
extensionPrivateLen = 0;
......@@ -71,7 +71,7 @@ ResetExtensionPrivates()
}
_X_EXPORT int
AllocateExtensionPrivateIndex()
AllocateExtensionPrivateIndex(void)
{
return extensionPrivateCount++;
}
......@@ -117,7 +117,7 @@ unsigned *clientPrivateSizes;
unsigned totalClientSize;
void
ResetClientPrivates()
ResetClientPrivates(void)
{
clientPrivateCount = 0;
clientPrivateLen = 0;
......@@ -128,7 +128,7 @@ ResetClientPrivates()
}
_X_EXPORT int
AllocateClientPrivateIndex()
AllocateClientPrivateIndex(void)
{
return clientPrivateCount++;
}
......@@ -171,7 +171,7 @@ AllocateClientPrivate(int index2, unsigned amount)
int screenPrivateCount;
void
ResetScreenPrivates()
ResetScreenPrivates(void)
{
screenPrivateCount = 0;
}
......@@ -180,7 +180,7 @@ ResetScreenPrivates()
* so we have to worry about resizing existing devPrivates
*/
_X_EXPORT int
AllocateScreenPrivateIndex()
AllocateScreenPrivateIndex(void)
{
int idx;
int i;
......@@ -213,13 +213,13 @@ AllocateScreenPrivateIndex()
static int windowPrivateCount;
void
ResetWindowPrivates()
ResetWindowPrivates(void)
{
windowPrivateCount = 0;
}
_X_EXPORT int
AllocateWindowPrivateIndex()
AllocateWindowPrivateIndex(void)
{
return windowPrivateCount++;
}
......@@ -263,13 +263,13 @@ AllocateWindowPrivate(ScreenPtr pScreen, int index2, unsigned amount)
static int gcPrivateCount;
void
ResetGCPrivates()
ResetGCPrivates(void)
{
gcPrivateCount = 0;
}
_X_EXPORT int
AllocateGCPrivateIndex()
AllocateGCPrivateIndex(void)
{
return gcPrivateCount++;
}
......@@ -312,13 +312,13 @@ AllocateGCPrivate(ScreenPtr pScreen, int index2, unsigned amount)
static int pixmapPrivateCount;
void
ResetPixmapPrivates()
ResetPixmapPrivates(void)
{
pixmapPrivateCount = 0;
}
_X_EXPORT int
AllocatePixmapPrivateIndex()
AllocatePixmapPrivateIndex(void)
{
return pixmapPrivateCount++;
}
......@@ -363,7 +363,7 @@ AllocatePixmapPrivate(ScreenPtr pScreen, int index2, unsigned amount)
int colormapPrivateCount;
void
ResetColormapPrivates()
ResetColormapPrivates(void)
{
colormapPrivateCount = 0;
}
......@@ -424,7 +424,7 @@ AllocateColormapPrivateIndex (InitCmapPrivFunc initPrivFunc)
static int devicePrivateIndex = 0;
_X_EXPORT int
AllocateDevicePrivateIndex()
AllocateDevicePrivateIndex(void)
{
return devicePrivateIndex++;
}
......
......@@ -235,7 +235,7 @@ CreateNewResourceType(DeleteType deleteFunc)
}
_X_EXPORT RESTYPE
CreateNewResourceClass()
CreateNewResourceClass(void)
{
RESTYPE next = lastResourceClass >> 1;
......@@ -844,7 +844,7 @@ FreeClientResources(ClientPtr client)
}
void
FreeAllResources()
FreeAllResources(void)
{
int i;
......
......@@ -176,7 +176,7 @@ xnestOpenDisplay(int argc, char *argv[])
}
void
xnestCloseDisplay()
xnestCloseDisplay(void)
{
if (!xnestDoFullGeneration || !xnestDisplay) return;
......
......@@ -52,7 +52,7 @@ ProcessInputEvents()
}
int
TimeSinceLastInputEvent()
TimeSinceLastInputEvent(void)
{
if (lastEventTime == 0)
lastEventTime = GetTimeInMillis();
......@@ -60,7 +60,7 @@ TimeSinceLastInputEvent()
}
void
SetTimeSinceLastInputEvent()
SetTimeSinceLastInputEvent(void)
{
lastEventTime = GetTimeInMillis();
}
......@@ -78,7 +78,7 @@ xnestNotExposurePredicate(Display *display, XEvent *event, char *args)
}
void
xnestCollectExposures()
xnestCollectExposures(void)
{
XEvent X;
WindowPtr pWin;
......@@ -113,7 +113,7 @@ xnestQueueKeyEvent(int type, unsigned int keycode)
}
void
xnestCollectEvents()
xnestCollectEvents(void)
{
XEvent X;
xEvent x;
......
......@@ -385,7 +385,7 @@ static int miVisualPriority[] = {
static miVisualsPtr miVisuals;
_X_EXPORT void
miClearVisualTypes()
miClearVisualTypes(void)
{
miVisualsPtr v;
......@@ -690,7 +690,7 @@ miDoInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp,
}
void
miResetInitVisuals()
miResetInitVisuals(void)
{
miInitVisualsProc = miDoInitVisuals;
}
......
......@@ -80,7 +80,7 @@ typedef struct _EventQueue {
static EventQueueRec miEventQueue;
Bool
mieqInit()
mieqInit(void)
{
int i;
......@@ -195,7 +195,7 @@ mieqSetHandler(int event, mieqHandler handler)
/* Call this from ProcessInputEvents(). */
void
mieqProcessInputEvents()
mieqProcessInputEvents(void)
{
EventRec *e = NULL;
int x = 0, y = 0;
......
......@@ -221,7 +221,7 @@ LogInit(const char *fname, const char *backup)
}
void
LogClose()
LogClose(void)
{
if (logFile) {
fclose(logFile);
......@@ -616,7 +616,7 @@ Error(char *str)
}
void
LogPrintMarkers()
LogPrintMarkers(void)
{
/* Show what the message marker symbols mean. */
ErrorF("Markers: ");
......
......@@ -102,7 +102,7 @@ typedef struct _builtinColor {
#define NUM_BUILTIN_COLORS (sizeof (BuiltinColors) / sizeof (BuiltinColors[0]))
Bool
OsInitColors()
OsInitColors(void)
{
return TRUE;
}
......
......@@ -86,13 +86,13 @@ static int globalTotalGlyphPrivateSize = 0;
static int glyphPrivateCount = 0;
void
ResetGlyphPrivates ()
ResetGlyphPrivates (void)
{
glyphPrivateCount = 0;
}
int
AllocateGlyphPrivateIndex ()
AllocateGlyphPrivateIndex (void)
{
return glyphPrivateCount++;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment