xserver: Branch 'master'
Alan Coopersmith
alanc at kemper.freedesktop.org
Tue Apr 10 00:35:58 EEST 2007
Xext/sync.c | 2 +-
Xext/xvmain.c | 8 ++++----
Xext/xvmc.c | 2 +-
config/config.c | 4 ++--
dix/atom.c | 6 +++---
dix/devices.c | 12 ++++++------
dix/dispatch.c | 8 ++++----
dix/dixfonts.c | 4 ++--
dix/dixutils.c | 4 ++--
dix/events.c | 16 ++++++++--------
dix/extension.c | 2 +-
dix/getevents.c | 4 ++--
dix/initatoms.c | 2 +-
dix/main.c | 2 +-
dix/privates.c | 28 ++++++++++++++--------------
dix/resource.c | 4 ++--
hw/xnest/Display.c | 2 +-
hw/xnest/Events.c | 8 ++++----
mi/micmap.c | 4 ++--
mi/mieq.c | 4 ++--
os/log.c | 4 ++--
os/oscolor.c | 2 +-
render/glyph.c | 4 ++--
23 files changed, 68 insertions(+), 68 deletions(-)
New commits:
diff-tree 1f6741db19d4c91b1eacb497dff1814acb1bf0c3 (from f24391dbfd12a84253dfec794ee7884afd52e197)
Author: Stefan Huehner <stefan at huehner.org>
Date: Mon Apr 9 14:33:15 2007 -0700
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>
diff --git a/Xext/sync.c b/Xext/sync.c
index 531b48c..c5441a1 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -2509,7 +2509,7 @@ ServertimeBracketValues(pCounter, pbrack
}
static void
-SyncInitServerTime()
+SyncInitServerTime(void)
{
CARD64 resolution;
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index 2233901..ddf3d1d 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -153,7 +153,7 @@ static int XvdiSendVideoNotify(XvPortPtr
*/
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;
}
diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index 737fc5d..ae35893 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -675,7 +675,7 @@ SProcXvMCDispatch (ClientPtr client)
}
void
-XvMCExtensionInit()
+XvMCExtensionInit(void)
{
ExtensionEntry *extEntry;
diff --git a/config/config.c b/config/config.c
index 6c40143..d72b588 100644
--- a/config/config.c
+++ b/config/config.c
@@ -410,13 +410,13 @@ configReconnect(OsTimerPtr timer, CARD32
}
void
-configInitialise()
+configInitialise(void)
{
TimerSet(NULL, 0, 1, configReconnect, NULL);
}
void
-configFini()
+configFini(void)
{
DBusError error;
diff --git a/dix/atom.c b/dix/atom.c
index bd3223c..6ae3e31 100644
--- a/dix/atom.c
+++ b/dix/atom.c
@@ -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;
diff --git a/dix/devices.c b/dix/devices.c
index f622be7..9631c86 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -314,7 +314,7 @@ CorePointerProc(DeviceIntPtr pDev, int w
}
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 devi
}
_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;
}
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 490b29c..6aba9db 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -218,7 +218,7 @@ SetInputCheck(HWEventQueuePtr c0, HWEven
}
_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++)
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index 62ad575..c21b3ec 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1878,7 +1878,7 @@ DeleteClientFontStuff(ClientPtr client)
}
void
-InitFonts ()
+InitFonts (void)
{
patternCache = MakeFontPatternCache();
@@ -1997,7 +1997,7 @@ RegisterFPEFunctions(NameCheckFunc name_
}
void
-FreeFonts()
+FreeFonts(void)
{
if (patternCache) {
FreeFontPatternCache(patternCache);
diff --git a/dix/dixutils.c b/dix/dixutils.c
index 44d82c9..30327d3 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -550,7 +550,7 @@ RemoveBlockAndWakeupHandlers (BlockHandl
}
void
-InitBlockAndWakeupHandlers ()
+InitBlockAndWakeupHandlers (void)
{
xfree (handlers);
handlers = (BlockHandlerPtr) 0;
@@ -950,7 +950,7 @@ DeleteCallbackList(CallbackListPtr *pcbl
}
void
-InitCallbackManager()
+InitCallbackManager(void)
{
int i;
diff --git a/dix/events.c b/dix/events.c
index e008e36..093a316 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -844,7 +844,7 @@ ConfineCursorToWindow(WindowPtr pWin, Bo
}
_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;
diff --git a/dix/extension.c b/dix/extension.c
index 88dff15..186574d 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -278,7 +278,7 @@ MinorOpcodeOfRequest(ClientPtr client)
}
void
-CloseDownExtensions()
+CloseDownExtensions(void)
{
int i,j;
diff --git a/dix/getevents.c b/dix/getevents.c
index 3f636bc..62f3bcb 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -73,7 +73,7 @@ extern Bool XkbCopyKeymap(XkbDescPtr src
* 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, C
* 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;
diff --git a/dix/initatoms.c b/dix/initatoms.c
index a5972af..de101bd 100644
--- a/dix/initatoms.c
+++ b/dix/initatoms.c
@@ -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();
diff --git a/dix/main.c b/dix/main.c
index 92c30b6..9a67ed9 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -544,7 +544,7 @@ static int padlength[4] = {0, 3, 2, 1};
static
#endif
Bool
-CreateConnectionBlock()
+CreateConnectionBlock(void)
{
xConnSetup setup;
xWindowRoot root;
diff --git a/dix/privates.c b/dix/privates.c
index a66fc3d..2465971 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -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, unsign
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,
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
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 colormapPrivateCount;
void
-ResetColormapPrivates()
+ResetColormapPrivates(void)
{
colormapPrivateCount = 0;
}
@@ -424,7 +424,7 @@ AllocateColormapPrivateIndex (InitCmapPr
static int devicePrivateIndex = 0;
_X_EXPORT int
-AllocateDevicePrivateIndex()
+AllocateDevicePrivateIndex(void)
{
return devicePrivateIndex++;
}
diff --git a/dix/resource.c b/dix/resource.c
index a5a7eed..f4bf1fc 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -235,7 +235,7 @@ CreateNewResourceType(DeleteType deleteF
}
_X_EXPORT RESTYPE
-CreateNewResourceClass()
+CreateNewResourceClass(void)
{
RESTYPE next = lastResourceClass >> 1;
@@ -844,7 +844,7 @@ FreeClientResources(ClientPtr client)
}
void
-FreeAllResources()
+FreeAllResources(void)
{
int i;
diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c
index 1ec0609..0129041 100644
--- a/hw/xnest/Display.c
+++ b/hw/xnest/Display.c
@@ -176,7 +176,7 @@ xnestOpenDisplay(int argc, char *argv[])
}
void
-xnestCloseDisplay()
+xnestCloseDisplay(void)
{
if (!xnestDoFullGeneration || !xnestDisplay) return;
diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c
index a209241..38fefa7 100644
--- a/hw/xnest/Events.c
+++ b/hw/xnest/Events.c
@@ -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 *displ
}
void
-xnestCollectExposures()
+xnestCollectExposures(void)
{
XEvent X;
WindowPtr pWin;
@@ -113,7 +113,7 @@ xnestQueueKeyEvent(int type, unsigned in
}
void
-xnestCollectEvents()
+xnestCollectEvents(void)
{
XEvent X;
xEvent x;
diff --git a/mi/micmap.c b/mi/micmap.c
index 977c587..33d9481 100644
--- a/mi/micmap.c
+++ b/mi/micmap.c
@@ -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, Dept
}
void
-miResetInitVisuals()
+miResetInitVisuals(void)
{
miInitVisualsProc = miDoInitVisuals;
}
diff --git a/mi/mieq.c b/mi/mieq.c
index 5bd87eb..34509cd 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -80,7 +80,7 @@ typedef struct _EventQueue {
static EventQueueRec miEventQueue;
Bool
-mieqInit()
+mieqInit(void)
{
int i;
@@ -195,7 +195,7 @@ mieqSetHandler(int event, mieqHandler ha
/* Call this from ProcessInputEvents(). */
void
-mieqProcessInputEvents()
+mieqProcessInputEvents(void)
{
EventRec *e = NULL;
int x = 0, y = 0;
diff --git a/os/log.c b/os/log.c
index b1d628c..e8aa3fa 100644
--- a/os/log.c
+++ b/os/log.c
@@ -221,7 +221,7 @@ LogInit(const char *fname, const char *b
}
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: ");
diff --git a/os/oscolor.c b/os/oscolor.c
index a13a3a6..d53e4d8 100644
--- a/os/oscolor.c
+++ b/os/oscolor.c
@@ -102,7 +102,7 @@ typedef struct _builtinColor {
#define NUM_BUILTIN_COLORS (sizeof (BuiltinColors) / sizeof (BuiltinColors[0]))
Bool
-OsInitColors()
+OsInitColors(void)
{
return TRUE;
}
diff --git a/render/glyph.c b/render/glyph.c
index 5987cbc..583a52b 100644
--- a/render/glyph.c
+++ b/render/glyph.c
@@ -86,13 +86,13 @@ static int globalTotalGlyphPrivateSize =
static int glyphPrivateCount = 0;
void
-ResetGlyphPrivates ()
+ResetGlyphPrivates (void)
{
glyphPrivateCount = 0;
}
int
-AllocateGlyphPrivateIndex ()
+AllocateGlyphPrivateIndex (void)
{
return glyphPrivateCount++;
}
More information about the xorg-commit
mailing list