xserver: Branch 'master' - 22 commits
Julien Cristau
jcristau at kemper.freedesktop.org
Sun Jan 11 00:10:58 PST 2009
Xext/bigreq.c | 3
Xext/dpms.c | 45 ++++---------
Xext/saver.c | 82 +++++++----------------
Xext/shape.c | 110 ++++++++++----------------------
Xext/sleepuntil.c | 29 ++------
Xext/sync.c | 29 +++-----
Xext/xace.c | 17 ++--
Xext/xcmisc.c | 24 ++----
Xext/xtest.c | 34 +++------
Xext/xvmain.c | 7 --
Xi/chdevhier.c | 4 +
config/config.c | 4 -
dix/devices.c | 12 +--
dix/events.c | 6 -
dix/swaprep.c | 5 -
dix/window.c | 4 -
hw/vfb/InitInput.c | 2
hw/vfb/InitOutput.c | 10 +-
hw/xfree86/common/xf86Bus.c | 4 -
hw/xfree86/common/xf86Config.c | 4 -
hw/xfree86/common/xf86DGA.c | 2
hw/xfree86/common/xf86Events.c | 8 +-
hw/xfree86/common/xf86Helper.c | 40 +++++------
hw/xfree86/common/xf86Init.c | 14 +---
hw/xfree86/common/xf86ShowOpts.c | 2
hw/xfree86/common/xf86Xinput.c | 4 -
hw/xfree86/common/xorgHelper.c | 2
hw/xfree86/dixmods/extmod/xvmod.c | 2
hw/xfree86/dri/xf86dri.c | 2
hw/xfree86/loader/loader.c | 2
hw/xfree86/loader/loadext.c | 2
hw/xfree86/os-support/bus/linuxPci.c | 1
hw/xfree86/os-support/linux/lnx_acpi.c | 8 +-
hw/xfree86/os-support/linux/lnx_agp.c | 4 -
hw/xfree86/os-support/linux/lnx_init.c | 4 -
hw/xfree86/os-support/shared/VTsw_usl.c | 6 -
hw/xfree86/os-support/shared/vidmem.c | 2
hw/xfree86/ramdac/xf86RamDac.c | 10 +-
hw/xfree86/shadowfb/shadow.c | 2
hw/xfree86/vgahw/vgaHW.c | 2
hw/xfree86/xaa/xaaFillArc.c | 6 -
hw/xfree86/xaa/xaaInit.c | 2
hw/xnest/Args.c | 2
hw/xnest/Events.c | 2
hw/xnest/Init.c | 10 +-
mi/mipointer.c | 7 +-
mi/miscrinit.c | 2
mi/mispans.c | 3
mi/misprite.c | 2
os/backtrace.c | 2
os/utils.c | 6 -
os/xdmcp.c | 4 -
randr/rroutput.c | 2
xkb/xkbInit.c | 2
54 files changed, 235 insertions(+), 371 deletions(-)
New commits:
commit 63ff7d236f67e159943312e1a551fcf5bb3f463a
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Jan 11 08:45:24 2009 +0100
os: don't mix declarations and code
diff --git a/os/utils.c b/os/utils.c
index e8d11f8..b630d9d 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -656,13 +656,13 @@ ProcessCommandLine(int argc, char *argv[])
}
else if ( strcmp( argv[i], "-core") == 0)
{
- CoreDump = TRUE;
#if !defined(WIN32) || !defined(__MINGW32__)
struct rlimit core_limit;
getrlimit (RLIMIT_CORE, &core_limit);
core_limit.rlim_cur = core_limit.rlim_max;
setrlimit (RLIMIT_CORE, &core_limit);
#endif
+ CoreDump = TRUE;
}
else if ( strcmp( argv[i], "-dpi") == 0)
{
commit f43a3c61ab1eab8aecdc0e4bdee9f3bae2cab234
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Jan 11 08:44:53 2009 +0100
os: backtrace() returns int, not size_t
diff --git a/os/backtrace.c b/os/backtrace.c
index b52dcde..19ff58d 100644
--- a/os/backtrace.c
+++ b/os/backtrace.c
@@ -33,7 +33,7 @@
void xorg_backtrace(void)
{
void *array[32]; /* deeper nesting than this means something's wrong */
- size_t size, i;
+ int size, i;
char **strings;
ErrorF("\nBacktrace:\n");
size = backtrace(array, 32);
commit 5321ae76cffc5fcfe4bebcfb10e08eecaf640503
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Jan 11 08:44:29 2009 +0100
os: ANSI cleanups
diff --git a/os/utils.c b/os/utils.c
index a41b0cf..e8d11f8 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -213,9 +213,7 @@ int auditTrailLevel = 1;
static char *dev_tty_from_init = NULL; /* since we need to parse it anyway */
OsSigHandlerPtr
-OsSignal(sig, handler)
- int sig;
- OsSigHandlerPtr handler;
+OsSignal(int sig, OsSigHandlerPtr handler)
{
struct sigaction act, oact;
diff --git a/os/xdmcp.c b/os/xdmcp.c
index 736cd3e..d819dd9 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -1590,9 +1590,7 @@ get_fromaddr_by_name(
#if defined(IPv6) && defined(AF_INET6)
static int
-get_mcast_options(argc, argv, i)
- int argc, i;
- char **argv;
+get_mcast_options(int argc, char **argv, int i)
{
char *address = XDM_DEFAULT_MCAST_ADDR6;
int hopcount = 1;
commit 47438a2161a92fec08081d2de28966cf8d31654a
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Jan 11 08:43:48 2009 +0100
randr: RRSetPrimaryOutput can be static
diff --git a/randr/rroutput.c b/randr/rroutput.c
index 82c2530..0a211e5 100644
--- a/randr/rroutput.c
+++ b/randr/rroutput.c
@@ -538,7 +538,7 @@ ProcRRGetOutputInfo (ClientPtr client)
return client->noClientException;
}
-void
+static void
RRSetPrimaryOutput(ScreenPtr pScreen, rrScrPrivPtr pScrPriv,
RROutputPtr output)
{
commit 7f82114b1dc738f98b9f22f6e61d6d5191383b67
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Jan 11 08:43:35 2009 +0100
xkb: ANSI cleanup
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 5f51c45..f10125b 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -290,7 +290,7 @@ XkbSetRulesDflts(char *rulesFile,char *model,char *layout,
}
void
-XkbDeleteRulesDflts()
+XkbDeleteRulesDflts(void)
{
_XkbFree(XkbRulesFile);
XkbRulesFile = NULL;
commit 46f3c1b937002f9a860878b359dcf5756a82dcf2
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Jan 11 08:42:57 2009 +0100
mi: don't mix declarations and code
diff --git a/mi/mipointer.c b/mi/mipointer.c
index be18956..4358759 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -284,10 +284,11 @@ miPointerDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
static void
miPointerDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
{
+ SetupScreen(pScreen);
+
if (!pDev->isMaster && pDev->u.master)
return;
- SetupScreen(pScreen);
(*pScreenPriv->spriteFuncs->DeviceCursorCleanup)(pDev, pScreen);
xfree(dixLookupPrivate(&pDev->devPrivates, miPointerPrivKey));
dixSetPrivate(&pDev->devPrivates, miPointerPrivKey, NULL);
@@ -302,8 +303,8 @@ miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
miPointerPtr pPointer;
BOOL changedScreen = FALSE;
- pPointer = MIPOINTER(pDev);
SetupScreen (pScreen);
+ pPointer = MIPOINTER(pDev);
if (pPointer->pScreen != pScreen)
{
diff --git a/mi/misprite.c b/mi/misprite.c
index da6fc55..467fd8f 100644
--- a/mi/misprite.c
+++ b/mi/misprite.c
@@ -725,10 +725,10 @@ miSpriteSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
CursorPtr pCursor, int x, int y)
{
miSpriteScreenPtr pScreenPriv;
+ miCursorInfoPtr pPointer;
pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
miSpriteScreenKey);
- miCursorInfoPtr pPointer;
if (!pDev->isMaster && !pDev->u.master)
{
commit 5aa9483d3ee306a79a9235610ce6b2754d697585
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Jan 11 08:42:28 2009 +0100
mi: ANSI cleanups
diff --git a/mi/mipointer.c b/mi/mipointer.c
index acfcb1b..be18956 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -437,7 +437,7 @@ miPointerSetScreen(DeviceIntPtr pDev, int screen_no, int x, int y)
}
ScreenPtr
-miPointerCurrentScreen ()
+miPointerCurrentScreen (void)
{
return miPointerGetScreen(inputInfo.pointer);
}
diff --git a/mi/miscrinit.c b/mi/miscrinit.c
index 92b3981..157a17f 100644
--- a/mi/miscrinit.c
+++ b/mi/miscrinit.c
@@ -297,7 +297,7 @@ static int privateKeyIndex;
static DevPrivateKey privateKey = &privateKeyIndex;
DevPrivateKey
-miAllocateGCPrivateIndex()
+miAllocateGCPrivateIndex(void)
{
return privateKey;
}
diff --git a/mi/mispans.c b/mi/mispans.c
index e59d711..33882a9 100644
--- a/mi/mispans.c
+++ b/mi/mispans.c
@@ -65,8 +65,7 @@ Written by Joel McCormack, Summer 1989.
*/
-void miInitSpanGroup(spanGroup)
- SpanGroup *spanGroup;
+void miInitSpanGroup(SpanGroup *spanGroup)
{
spanGroup->size = 0;
spanGroup->count = 0;
commit 359ed32c9b013ed88e14c99aa7fd7a617a85e2c5
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Jan 11 08:40:58 2009 +0100
xnest: only define ddxBeforeReset if needed
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index 2a9fc26..49a52d7 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -136,7 +136,9 @@ void OsVendorFatalError(void)
return;
}
+#if defined(DDXBEFORERESET)
void ddxBeforeReset(void)
{
return;
}
+#endif
commit 9651cd8d7ac26635b6fb1826806ac9f4e2bddb63
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Jan 11 08:40:47 2009 +0100
xnest: ANSI cleanups
diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c
index b95f700..cdc8311 100644
--- a/hw/xnest/Args.c
+++ b/hw/xnest/Args.c
@@ -174,7 +174,7 @@ ddxProcessArgument (int argc, char *argv[], int i)
return 0;
}
-void ddxUseMsg()
+void ddxUseMsg(void)
{
ErrorF("-display string display name of the real server\n");
ErrorF("-sync sinchronize with the real server\n");
diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c
index b3ae972..c2c09aa 100644
--- a/hw/xnest/Events.c
+++ b/hw/xnest/Events.c
@@ -45,7 +45,7 @@ CARD32 lastEventTime = 0;
extern EventList *xnestEvents;
void
-ProcessInputEvents()
+ProcessInputEvents(void)
{
mieqProcessInputEvents();
}
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index f80bbd1..2a9fc26 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -107,14 +107,14 @@ InitInput(int argc, char *argv[])
/*
* DDX - specific abort routine. Called by AbortServer().
*/
-void AbortDDX()
+void AbortDDX(void)
{
xnestDoFullGeneration = True;
xnestCloseDisplay();
}
/* Called by GiveUp(). */
-void ddxGiveUp()
+void ddxGiveUp(void)
{
AbortDDX();
}
@@ -126,12 +126,12 @@ DarwinHandleGUI(int argc, char *argv[])
}
#endif
-void OsVendorInit()
+void OsVendorInit(void)
{
return;
}
-void OsVendorFatalError()
+void OsVendorFatalError(void)
{
return;
}
commit 31439195c51f183f5a8989a8d4f95b3e6326eda0
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Jan 11 08:37:06 2009 +0100
xfree86: linuxPci.c needs a prototype for xf86AccResFromOS
diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c
index 5cb328d..a84ac8f 100644
--- a/hw/xfree86/os-support/bus/linuxPci.c
+++ b/hw/xfree86/os-support/bus/linuxPci.c
@@ -52,6 +52,7 @@
#include "compiler.h"
#include "xf86.h"
#include "xf86Priv.h"
+#define NEED_OS_RAC_PROTOS
#include "xf86_OSlib.h"
#include "Pci.h"
#include <dirent.h>
commit a00dbd0015845e08ef2af9480cc3833819cf86f5
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Jan 11 08:36:16 2009 +0100
xfree86: use %zu to format size_t arguments
diff --git a/hw/xfree86/os-support/linux/lnx_agp.c b/hw/xfree86/os-support/linux/lnx_agp.c
index e5eb30c..6143740 100644
--- a/hw/xfree86/os-support/linux/lnx_agp.c
+++ b/hw/xfree86/os-support/linux/lnx_agp.c
@@ -155,7 +155,7 @@ xf86GetAGPInfo(int screenNum)
info->systemPages = agpinf.pg_system;
info->usedPages = agpinf.pg_used;
- xf86DrvMsg(screenNum, X_INFO, "Kernel reported %d total, %d used\n", agpinf.pg_total, agpinf.pg_used);
+ xf86DrvMsg(screenNum, X_INFO, "Kernel reported %zu total, %zu used\n", agpinf.pg_total, agpinf.pg_used);
return info;
}
commit 17c8cb50990a9ad20bbd3f8ce14c149dac9d72ad
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Jan 11 08:34:56 2009 +0100
xfree86: don't mix declarations and code
diff --git a/hw/xfree86/common/xf86ShowOpts.c b/hw/xfree86/common/xf86ShowOpts.c
index b8efa73..622e261 100644
--- a/hw/xfree86/common/xf86ShowOpts.c
+++ b/hw/xfree86/common/xf86ShowOpts.c
@@ -104,10 +104,10 @@ void DoShowOptions (void) {
initData = LoaderSymbol (pSymbol);
if (initData) {
XF86ModuleVersionInfo *vers = initData->vers;
+ OptionInfoPtr p;
ErrorF ("Driver[%d]:%s[%s] {\n",
i,xf86DriverList[i]->driverName,vers->vendor
);
- OptionInfoPtr p;
for (p = pOption; p->name != NULL; p++) {
const char *opttype = optionTypeToSting(p->type);
char *optname = xalloc(strlen(p->name) + 2 + 1);
diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c
index bd040a1..902fe12 100644
--- a/hw/xfree86/dri/xf86dri.c
+++ b/hw/xfree86/dri/xf86dri.c
@@ -406,8 +406,8 @@ ProcXF86DRIDestroyDrawable(
{
REQUEST(xXF86DRIDestroyDrawableReq);
DrawablePtr pDrawable;
- REQUEST_SIZE_MATCH(xXF86DRIDestroyDrawableReq);
int rc;
+ REQUEST_SIZE_MATCH(xXF86DRIDestroyDrawableReq);
if (stuff->screen >= screenInfo.numScreens) {
client->errorValue = stuff->screen;
diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c
index ff775ef..ea6a2a0 100644
--- a/hw/xfree86/shadowfb/shadow.c
+++ b/hw/xfree86/shadowfb/shadow.c
@@ -102,7 +102,7 @@ static DevPrivateKey ShadowGCKey = &ShadowGCKeyIndex;
#define GET_SCREEN_PRIVATE(pScreen) \
(ShadowScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, ShadowScreenKey)
#define GET_GC_PRIVATE(pGC) \
- (ShadowGCPtr)dixLookupPrivate(&(pGC)->devPrivates, ShadowGCKey);
+ (ShadowGCPtr)dixLookupPrivate(&(pGC)->devPrivates, ShadowGCKey)
#define SHADOW_GC_FUNC_PROLOGUE(pGC)\
ShadowGCPtr pGCPriv = GET_GC_PRIVATE(pGC);\
commit aec4c0caca41a06832536ba82ba5bcdccf4a0aea
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Jan 11 08:33:18 2009 +0100
xfree86: ANSI cleanups
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index e0e3cb4..1f8e4de 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 a8b568f..bb67898 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 bbb8792..9c701c5 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 c7f6c88..1babf12 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 78df060..9aeba27 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 542695c..97b703d 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 e8acf39..582c722 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 7f9dd50..7a8e516 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 6b3f114..9551046 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 231daf8..dad44d8 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 c403364..a61b28c 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 4c1722f..e5eb30c 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 6ee8ed6..0ac97e8 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 4d47314..9308640 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 f8a488a..803ce09 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 70c752e..bd4f346 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 1c278d1..9d466e3 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 d3ebc22..d83922c 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 326da61..2ce2d90 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;
commit dba3b1944d04232f88bb310277639f2c1adcbe08
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Jan 11 08:28:23 2009 +0100
Xvfb: ANSI cleanups
diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c
index feb7ad1..d2abfc2 100644
--- a/hw/vfb/InitInput.c
+++ b/hw/vfb/InitInput.c
@@ -48,7 +48,7 @@ LegalModifier(unsigned int key, DeviceIntPtr pDev)
}
void
-ProcessInputEvents()
+ProcessInputEvents(void)
{
mieqProcessInputEvents();
}
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index bcfb2ef..af3e8f1 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -163,7 +163,7 @@ vfbBitsPerPixel(int depth)
}
void
-ddxGiveUp()
+ddxGiveUp(void)
{
int i;
@@ -214,7 +214,7 @@ ddxGiveUp()
}
void
-AbortDDX()
+AbortDDX(void)
{
ddxGiveUp();
}
@@ -227,12 +227,12 @@ DarwinHandleGUI(int argc, char *argv[])
#endif
void
-OsVendorInit()
+OsVendorInit(void)
{
}
void
-OsVendorFatalError()
+OsVendorFatalError(void)
{
}
@@ -244,7 +244,7 @@ void ddxBeforeReset(void)
#endif
void
-ddxUseMsg()
+ddxUseMsg(void)
{
ErrorF("-screen scrn WxHxD set screen's width, height, depth\n");
ErrorF("-pixdepths list-of-int support given pixmap depths\n");
commit a2a760e33c17e211650b1f53c05a89c013916cf3
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Jan 11 08:25:39 2009 +0100
dix: don't mix declarations and code
diff --git a/dix/window.c b/dix/window.c
index 5e8338f..d750b3b 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -3079,11 +3079,11 @@ void
SendVisibilityNotify(WindowPtr pWin)
{
xEvent event;
- if (!MapUnmapEventsEnabled(pWin))
- return;
#ifndef NO_XINERAMA_PORT
unsigned int visibility = pWin->visibility;
#endif
+ if (!MapUnmapEventsEnabled(pWin))
+ return;
#ifdef PANORAMIX
/* This is not quite correct yet, but it's close */
if(!noPanoramiXExtension) {
commit 466dddbb83aa37ae93fb32976d51ecaa947c3616
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Jan 11 08:25:17 2009 +0100
dix: fix cast from pointer to integer
diff --git a/dix/devices.c b/dix/devices.c
index 4e78971..e5e3832 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -1465,7 +1465,7 @@ InitStringFeedbackClassDeviceStruct (
for (i=0; i<num_symbols_supported; i++)
*(feedc->ctrl.symbols_supported+i) = *symbols++;
for (i=0; i<max_symbols; i++)
- *(feedc->ctrl.symbols_displayed+i) = (KeySym) NULL;
+ *(feedc->ctrl.symbols_displayed+i) = (KeySym) 0;
feedc->ctrl.id = 0;
if ( (feedc->next = dev->stringfeed) )
feedc->ctrl.id = dev->stringfeed->ctrl.id + 1;
commit 54332e4732577dc49e440d9c9f8dd7d791f03f8e
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Jan 11 08:20:06 2009 +0100
dix: ANSI cleanups
diff --git a/dix/devices.c b/dix/devices.c
index b2a8f06..4e78971 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -625,7 +625,7 @@ InitCoreDevices(void)
* @return Success or error code on failure.
*/
int
-InitAndStartDevices()
+InitAndStartDevices(void)
{
DeviceIntPtr dev, next;
@@ -930,7 +930,7 @@ CloseDownDevices(void)
* resources are freed or any device is deleted.
*/
void
-UndisplayDevices()
+UndisplayDevices(void)
{
DeviceIntPtr dev;
ScreenPtr screen = screenInfo.screens[0];
@@ -1621,10 +1621,8 @@ BadDeviceMap(BYTE *buff, int length, unsigned low, unsigned high, XID *errval)
}
Bool
-AllModifierKeysAreUp(dev, map1, per1, map2, per2)
- DeviceIntPtr dev;
- CARD8 *map1, *map2;
- int per1, per2;
+AllModifierKeysAreUp(DeviceIntPtr dev, CARD8 *map1, int per1,
+ CARD8 *map2, int per2)
{
int i, j, k;
CARD8 *down = dev->key->down;
diff --git a/dix/events.c b/dix/events.c
index c1ca4e0..ba90ff1 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -3964,8 +3964,7 @@ ProcessPointerEvent (xEvent *xE, DeviceIntPtr mouse, int count)
* Traverses to siblings and parents of the window.
*/
void
-RecalculateDeliverableEvents(pWin)
- WindowPtr pWin;
+RecalculateDeliverableEvents(WindowPtr pWin)
{
OtherClients *others;
WindowPtr pChild;
@@ -4478,8 +4477,7 @@ SetInputFocus(
* Sets the input focus for the virtual core keyboard.
*/
int
-ProcSetInputFocus(client)
- ClientPtr client;
+ProcSetInputFocus(ClientPtr client)
{
DeviceIntPtr kbd = PickKeyboard(client);
REQUEST(xSetInputFocusReq);
diff --git a/dix/swaprep.c b/dix/swaprep.c
index af82f82..493def5 100644
--- a/dix/swaprep.c
+++ b/dix/swaprep.c
@@ -524,10 +524,7 @@ SListInstalledColormapsReply(ClientPtr pClient, int size,
}
void
-SAllocColorReply(pClient, size, pRep)
- ClientPtr pClient;
- int size;
- xAllocColorReply *pRep;
+SAllocColorReply(ClientPtr pClient, int size, xAllocColorReply *pRep)
{
char n;
commit ef9902652b8a1c716ea3851565d6e2a98bd30eb0
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Jan 11 08:18:56 2009 +0100
config: ANSI cleanups
diff --git a/config/config.c b/config/config.c
index 882b699..b013293 100644
--- a/config/config.c
+++ b/config/config.c
@@ -32,7 +32,7 @@
#include "config-backends.h"
void
-config_init()
+config_init(void)
{
#if defined(CONFIG_DBUS_API) || defined(CONFIG_HAL)
if (config_dbus_core_init()) {
@@ -52,7 +52,7 @@ config_init()
}
void
-config_fini()
+config_fini(void)
{
#if defined(CONFIG_DBUS_API) || defined(CONFIG_HAL)
# ifdef CONFIG_HAL
commit e64473b14e091e4b75e6ac2bf9a35e9aaa907258
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Jan 11 08:17:41 2009 +0100
Xi: fix missing declaration of XkbSetRulesDflts
diff --git a/Xi/chdevhier.c b/Xi/chdevhier.c
index 9d3c25d..02aac88 100644
--- a/Xi/chdevhier.c
+++ b/Xi/chdevhier.c
@@ -48,6 +48,10 @@
#include "geext.h"
#include "xace.h"
+#ifdef XKB
+#include "xkbsrv.h"
+#endif
+
#include "chdevhier.h"
commit 6e20a4ae731b7bc72266e5809faa0ecfde2bdfe4
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Jan 11 08:16:55 2009 +0100
xsync: make SyncAlarmCounterDestroyed static
diff --git a/Xext/sync.c b/Xext/sync.c
index d0e7f95..d529bec 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -448,7 +448,7 @@ SyncSendCounterNotifyEvents(ClientPtr client, SyncAwait **ppAwait,
/* This function is called when an alarm's counter is destroyed.
* It is plugged into pTrigger->CounterDestroyed (for alarm triggers).
*/
-void
+static void
SyncAlarmCounterDestroyed(SyncTrigger *pTrigger)
{
SyncAlarm *pAlarm = (SyncAlarm *)pTrigger;
commit 292311b421e53ead53c7df67d735a3d6d3e5b515
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Jan 11 08:16:12 2009 +0100
Xext: ANSI cleanups
diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index 7ea69a8..8857df3 100644
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -51,8 +51,7 @@ BigReqExtensionInit(INITARGS)
}
static int
-ProcBigReqDispatch (client)
- ClientPtr client;
+ProcBigReqDispatch (ClientPtr client)
{
REQUEST(xBigReqEnableReq);
xBigReqEnableReply rep;
diff --git a/Xext/dpms.c b/Xext/dpms.c
index bad7aa6..672cf17 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -78,8 +78,7 @@ DPMSExtensionInit(INITARGS)
}
static int
-ProcDPMSGetVersion(client)
- ClientPtr client;
+ProcDPMSGetVersion(ClientPtr client)
{
/* REQUEST(xDPMSGetVersionReq); */
xDPMSGetVersionReply rep;
@@ -123,8 +122,7 @@ ProcDPMSCapable(ClientPtr client)
}
static int
-ProcDPMSGetTimeouts(client)
- ClientPtr client;
+ProcDPMSGetTimeouts(ClientPtr client)
{
/* REQUEST(xDPMSGetTimeoutsReq); */
xDPMSGetTimeoutsReply rep;
@@ -150,8 +148,7 @@ ProcDPMSGetTimeouts(client)
}
static int
-ProcDPMSSetTimeouts(client)
- ClientPtr client;
+ProcDPMSSetTimeouts(ClientPtr client)
{
REQUEST(xDPMSSetTimeoutsReq);
@@ -177,8 +174,7 @@ ProcDPMSSetTimeouts(client)
}
static int
-ProcDPMSEnable(client)
- ClientPtr client;
+ProcDPMSEnable(ClientPtr client)
{
Bool was_enabled = DPMSEnabled;
@@ -194,8 +190,7 @@ ProcDPMSEnable(client)
}
static int
-ProcDPMSDisable(client)
- ClientPtr client;
+ProcDPMSDisable(ClientPtr client)
{
/* REQUEST(xDPMSDisableReq); */
@@ -209,8 +204,7 @@ ProcDPMSDisable(client)
}
static int
-ProcDPMSForceLevel(client)
- ClientPtr client;
+ProcDPMSForceLevel(ClientPtr client)
{
REQUEST(xDPMSForceLevelReq);
@@ -265,8 +259,7 @@ ProcDPMSInfo(ClientPtr client)
}
static int
-ProcDPMSDispatch (client)
- ClientPtr client;
+ProcDPMSDispatch (ClientPtr client)
{
REQUEST(xReq);
@@ -294,8 +287,7 @@ ProcDPMSDispatch (client)
}
static int
-SProcDPMSGetVersion(client)
- ClientPtr client;
+SProcDPMSGetVersion(ClientPtr client)
{
int n;
REQUEST(xDPMSGetVersionReq);
@@ -320,8 +312,7 @@ SProcDPMSCapable(ClientPtr client)
}
static int
-SProcDPMSGetTimeouts(client)
- ClientPtr client;
+SProcDPMSGetTimeouts(ClientPtr client)
{
REQUEST(xDPMSGetTimeoutsReq);
int n;
@@ -333,8 +324,7 @@ SProcDPMSGetTimeouts(client)
}
static int
-SProcDPMSSetTimeouts(client)
- ClientPtr client;
+SProcDPMSSetTimeouts(ClientPtr client)
{
REQUEST(xDPMSSetTimeoutsReq);
int n;
@@ -349,8 +339,7 @@ SProcDPMSSetTimeouts(client)
}
static int
-SProcDPMSEnable(client)
- ClientPtr client;
+SProcDPMSEnable(ClientPtr client)
{
REQUEST(xDPMSEnableReq);
int n;
@@ -362,8 +351,7 @@ SProcDPMSEnable(client)
}
static int
-SProcDPMSDisable(client)
- ClientPtr client;
+SProcDPMSDisable(ClientPtr client)
{
REQUEST(xDPMSDisableReq);
int n;
@@ -375,8 +363,7 @@ SProcDPMSDisable(client)
}
static int
-SProcDPMSForceLevel(client)
- ClientPtr client;
+SProcDPMSForceLevel(ClientPtr client)
{
REQUEST(xDPMSForceLevelReq);
int n;
@@ -390,8 +377,7 @@ SProcDPMSForceLevel(client)
}
static int
-SProcDPMSInfo(client)
- ClientPtr client;
+SProcDPMSInfo(ClientPtr client)
{
REQUEST(xDPMSInfoReq);
int n;
@@ -403,8 +389,7 @@ SProcDPMSInfo(client)
}
static int
-SProcDPMSDispatch (client)
- ClientPtr client;
+SProcDPMSDispatch (ClientPtr client)
{
REQUEST(xReq);
switch (stuff->data)
diff --git a/Xext/saver.c b/Xext/saver.c
index 7a5b2c7..dd8ebe8 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -272,8 +272,7 @@ ScreenSaverExtensionInit(INITARGS)
}
static void
-CheckScreenPrivate (pScreen)
- ScreenPtr pScreen;
+CheckScreenPrivate (ScreenPtr pScreen)
{
SetupScreen (pScreen);
@@ -289,8 +288,7 @@ CheckScreenPrivate (pScreen)
}
static ScreenSaverScreenPrivatePtr
-MakeScreenPrivate (pScreen)
- ScreenPtr pScreen;
+MakeScreenPrivate (ScreenPtr pScreen)
{
SetupScreen (pScreen);
@@ -309,9 +307,7 @@ MakeScreenPrivate (pScreen)
}
static unsigned long
-getEventMask (pScreen, client)
- ScreenPtr pScreen;
- ClientPtr client;
+getEventMask (ScreenPtr pScreen, ClientPtr client)
{
SetupScreen(pScreen);
ScreenSaverEventPtr pEv;
@@ -325,10 +321,7 @@ getEventMask (pScreen, client)
}
static Bool
-setEventMask (pScreen, client, mask)
- ScreenPtr pScreen;
- ClientPtr client;
- unsigned long mask;
+setEventMask (ScreenPtr pScreen, ClientPtr client, unsigned long mask)
{
SetupScreen(pScreen);
ScreenSaverEventPtr pEv, *pPrev;
@@ -375,8 +368,7 @@ setEventMask (pScreen, client, mask)
}
static void
-FreeAttrs (pAttr)
- ScreenSaverAttrPtr pAttr;
+FreeAttrs (ScreenSaverAttrPtr pAttr)
{
PixmapPtr pPixmap;
CursorPtr pCursor;
@@ -390,8 +382,7 @@ FreeAttrs (pAttr)
}
static void
-FreeScreenAttr (pAttr)
- ScreenSaverAttrPtr pAttr;
+FreeScreenAttr (ScreenSaverAttrPtr pAttr)
{
FreeAttrs (pAttr);
xfree (pAttr->values);
@@ -399,9 +390,7 @@ FreeScreenAttr (pAttr)
}
static int
-ScreenSaverFreeEvents (value, id)
- pointer value;
- XID id;
+ScreenSaverFreeEvents (pointer value, XID id)
{
ScreenSaverEventPtr pOld = (ScreenSaverEventPtr)value;
ScreenPtr pScreen = pOld->screen;
@@ -422,9 +411,7 @@ ScreenSaverFreeEvents (value, id)
}
static int
-ScreenSaverFreeAttr (value, id)
- pointer value;
- XID id;
+ScreenSaverFreeAttr (pointer value, XID id)
{
ScreenSaverAttrPtr pOldAttr = (ScreenSaverAttrPtr)value;
ScreenPtr pScreen = pOldAttr->screen;
@@ -485,10 +472,7 @@ ScreenSaverFreeSuspend (pointer value, XID id)
}
static void
-SendScreenSaverNotify (pScreen, state, forced)
- ScreenPtr pScreen;
- int state;
- Bool forced;
+SendScreenSaverNotify (ScreenPtr pScreen, int state, Bool forced)
{
ScreenSaverScreenPrivatePtr pPriv;
ScreenSaverEventPtr pEv;
@@ -531,8 +515,8 @@ SendScreenSaverNotify (pScreen, state, forced)
}
static void
-SScreenSaverNotifyEvent (from, to)
- xScreenSaverNotifyEvent *from, *to;
+SScreenSaverNotifyEvent (xScreenSaverNotifyEvent *from,
+ xScreenSaverNotifyEvent *to)
{
to->type = from->type;
to->state = from->state;
@@ -545,8 +529,7 @@ SScreenSaverNotifyEvent (from, to)
}
static void
-UninstallSaverColormap (pScreen)
- ScreenPtr pScreen;
+UninstallSaverColormap (ScreenPtr pScreen)
{
SetupScreen(pScreen);
ColormapPtr pCmap;
@@ -562,8 +545,7 @@ UninstallSaverColormap (pScreen)
}
static Bool
-CreateSaverWindow (pScreen)
- ScreenPtr pScreen;
+CreateSaverWindow (ScreenPtr pScreen)
{
SetupScreen (pScreen);
ScreenSaverStuffPtr pSaver;
@@ -682,8 +664,7 @@ CreateSaverWindow (pScreen)
}
static Bool
-DestroySaverWindow (pScreen)
- ScreenPtr pScreen;
+DestroySaverWindow (ScreenPtr pScreen)
{
SetupScreen(pScreen);
ScreenSaverStuffPtr pSaver;
@@ -704,10 +685,7 @@ DestroySaverWindow (pScreen)
}
static Bool
-ScreenSaverHandle (pScreen, xstate, force)
- ScreenPtr pScreen;
- int xstate;
- Bool force;
+ScreenSaverHandle (ScreenPtr pScreen, int xstate, Bool force)
{
int state = 0;
Bool ret = FALSE;
@@ -738,8 +716,7 @@ ScreenSaverHandle (pScreen, xstate, force)
}
static int
-ProcScreenSaverQueryVersion (client)
- ClientPtr client;
+ProcScreenSaverQueryVersion (ClientPtr client)
{
xScreenSaverQueryVersionReply rep;
int n;
@@ -759,8 +736,7 @@ ProcScreenSaverQueryVersion (client)
}
static int
-ProcScreenSaverQueryInfo (client)
- ClientPtr client;
+ProcScreenSaverQueryInfo (ClientPtr client)
{
REQUEST(xScreenSaverQueryInfoReq);
xScreenSaverQueryInfoReply rep;
@@ -836,8 +812,7 @@ ProcScreenSaverQueryInfo (client)
}
static int
-ProcScreenSaverSelectInput (client)
- ClientPtr client;
+ProcScreenSaverSelectInput (ClientPtr client)
{
REQUEST(xScreenSaverSelectInputReq);
DrawablePtr pDraw;
@@ -1442,8 +1417,7 @@ static DISPATCH_PROC((*NormalVector[])) = {
#define NUM_REQUESTS ((sizeof NormalVector) / (sizeof NormalVector[0]))
static int
-ProcScreenSaverDispatch (client)
- ClientPtr client;
+ProcScreenSaverDispatch (ClientPtr client)
{
REQUEST(xReq);
@@ -1453,8 +1427,7 @@ ProcScreenSaverDispatch (client)
}
static int
-SProcScreenSaverQueryVersion (client)
- ClientPtr client;
+SProcScreenSaverQueryVersion (ClientPtr client)
{
REQUEST(xScreenSaverQueryVersionReq);
int n;
@@ -1465,8 +1438,7 @@ SProcScreenSaverQueryVersion (client)
}
static int
-SProcScreenSaverQueryInfo (client)
- ClientPtr client;
+SProcScreenSaverQueryInfo (ClientPtr client)
{
REQUEST(xScreenSaverQueryInfoReq);
int n;
@@ -1478,8 +1450,7 @@ SProcScreenSaverQueryInfo (client)
}
static int
-SProcScreenSaverSelectInput (client)
- ClientPtr client;
+SProcScreenSaverSelectInput (ClientPtr client)
{
REQUEST(xScreenSaverSelectInputReq);
int n;
@@ -1492,8 +1463,7 @@ SProcScreenSaverSelectInput (client)
}
static int
-SProcScreenSaverSetAttributes (client)
- ClientPtr client;
+SProcScreenSaverSetAttributes (ClientPtr client)
{
REQUEST(xScreenSaverSetAttributesReq);
int n;
@@ -1513,8 +1483,7 @@ SProcScreenSaverSetAttributes (client)
}
static int
-SProcScreenSaverUnsetAttributes (client)
- ClientPtr client;
+SProcScreenSaverUnsetAttributes (ClientPtr client)
{
REQUEST(xScreenSaverUnsetAttributesReq);
int n;
@@ -1547,8 +1516,7 @@ static DISPATCH_PROC((*SwappedVector[])) = {
};
static int
-SProcScreenSaverDispatch (client)
- ClientPtr client;
+SProcScreenSaverDispatch (ClientPtr client)
{
REQUEST(xReq);
diff --git a/Xext/shape.c b/Xext/shape.c
index 8e1da87..d8d5643 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -63,18 +63,6 @@ static void SShapeNotifyEvent(
xShapeNotifyEvent * /* from */,
xShapeNotifyEvent * /* to */
);
-static int
-RegionOperate (
- ClientPtr /* client */,
- WindowPtr /* pWin */,
- int /* kind */,
- RegionPtr * /* destRgnp */,
- RegionPtr /* srcRgn */,
- int /* op */,
- int /* xoff */,
- int /* yoff */,
- CreateDftPtr /* create */
- );
/* SendShapeNotify, CreateBoundingShape and CreateClipShape are used
* externally by the Xfixes extension and are now defined in window.h
@@ -152,14 +140,15 @@ ShapeExtensionInit(void)
}
static int
-RegionOperate (client, pWin, kind, destRgnp, srcRgn, op, xoff, yoff, create)
- ClientPtr client;
- WindowPtr pWin;
- int kind;
- RegionPtr *destRgnp, srcRgn;
- int op;
- int xoff, yoff;
- CreateDftPtr create; /* creates a reasonable *destRgnp */
+RegionOperate (
+ ClientPtr client,
+ WindowPtr pWin,
+ int kind,
+ RegionPtr *destRgnp,
+ RegionPtr srcRgn,
+ int op,
+ int xoff, int yoff,
+ CreateDftPtr create)
{
ScreenPtr pScreen = pWin->drawable.pScreen;
@@ -237,8 +226,7 @@ RegionOperate (client, pWin, kind, destRgnp, srcRgn, op, xoff, yoff, create)
}
RegionPtr
-CreateBoundingShape (pWin)
- WindowPtr pWin;
+CreateBoundingShape (WindowPtr pWin)
{
BoxRec extents;
@@ -250,8 +238,7 @@ CreateBoundingShape (pWin)
}
RegionPtr
-CreateClipShape (pWin)
- WindowPtr pWin;
+CreateClipShape (WindowPtr pWin)
{
BoxRec extents;
@@ -263,8 +250,7 @@ CreateClipShape (pWin)
}
static int
-ProcShapeQueryVersion (client)
- ClientPtr client;
+ProcShapeQueryVersion (ClientPtr client)
{
xShapeQueryVersionReply rep;
int n;
@@ -291,8 +277,7 @@ ProcShapeQueryVersion (client)
*****************/
static int
-ProcShapeRectangles (client)
- ClientPtr client;
+ProcShapeRectangles (ClientPtr client)
{
WindowPtr pWin;
ScreenPtr pScreen;
@@ -391,8 +376,7 @@ ProcPanoramiXShapeRectangles(
static int
-ProcShapeMask (client)
- ClientPtr client;
+ProcShapeMask (ClientPtr client)
{
WindowPtr pWin;
ScreenPtr pScreen;
@@ -498,8 +482,7 @@ ProcPanoramiXShapeMask(
************/
static int
-ProcShapeCombine (client)
- ClientPtr client;
+ProcShapeCombine (ClientPtr client)
{
WindowPtr pSrcWin, pDestWin;
ScreenPtr pScreen;
@@ -622,8 +605,7 @@ ProcPanoramiXShapeCombine(
*************/
static int
-ProcShapeOffset (client)
- ClientPtr client;
+ProcShapeOffset (ClientPtr client)
{
WindowPtr pWin;
ScreenPtr pScreen;
@@ -687,8 +669,7 @@ ProcPanoramiXShapeOffset(
static int
-ProcShapeQueryExtents (client)
- ClientPtr client;
+ProcShapeQueryExtents (ClientPtr client)
{
REQUEST(xShapeQueryExtentsReq);
WindowPtr pWin;
@@ -752,9 +733,7 @@ ProcShapeQueryExtents (client)
/*ARGSUSED*/
static int
-ShapeFreeClient (data, id)
- pointer data;
- XID id;
+ShapeFreeClient (pointer data, XID id)
{
ShapeEventPtr pShapeEvent;
WindowPtr pWin;
@@ -781,9 +760,7 @@ ShapeFreeClient (data, id)
/*ARGSUSED*/
static int
-ShapeFreeEvents (data, id)
- pointer data;
- XID id;
+ShapeFreeEvents (pointer data, XID id)
{
ShapeEventPtr *pHead, pCur, pNext;
@@ -798,8 +775,7 @@ ShapeFreeEvents (data, id)
}
static int
-ProcShapeSelectInput (client)
- ClientPtr client;
+ProcShapeSelectInput (ClientPtr client)
{
REQUEST(xShapeSelectInputReq);
WindowPtr pWin;
@@ -894,9 +870,7 @@ ProcShapeSelectInput (client)
*/
void
-SendShapeNotify (pWin, which)
- WindowPtr pWin;
- int which;
+SendShapeNotify (WindowPtr pWin, int which)
{
ShapeEventPtr *pHead, pShapeEvent;
ClientPtr client;
@@ -970,8 +944,7 @@ SendShapeNotify (pWin, which)
}
static int
-ProcShapeInputSelected (client)
- ClientPtr client;
+ProcShapeInputSelected (ClientPtr client)
{
REQUEST(xShapeInputSelectedReq);
WindowPtr pWin;
@@ -1011,8 +984,7 @@ ProcShapeInputSelected (client)
}
static int
-ProcShapeGetRectangles (client)
- ClientPtr client;
+ProcShapeGetRectangles (ClientPtr client)
{
REQUEST(xShapeGetRectanglesReq);
WindowPtr pWin;
@@ -1097,8 +1069,7 @@ ProcShapeGetRectangles (client)
}
static int
-ProcShapeDispatch (client)
- ClientPtr client;
+ProcShapeDispatch (ClientPtr client)
{
REQUEST(xReq);
switch (stuff->data) {
@@ -1146,8 +1117,7 @@ ProcShapeDispatch (client)
}
static void
-SShapeNotifyEvent(from, to)
- xShapeNotifyEvent *from, *to;
+SShapeNotifyEvent(xShapeNotifyEvent *from, xShapeNotifyEvent *to)
{
to->type = from->type;
to->kind = from->kind;
@@ -1162,8 +1132,7 @@ SShapeNotifyEvent(from, to)
}
static int
-SProcShapeQueryVersion (client)
- ClientPtr client;
+SProcShapeQueryVersion (ClientPtr client)
{
int n;
REQUEST (xShapeQueryVersionReq);
@@ -1173,8 +1142,7 @@ SProcShapeQueryVersion (client)
}
static int
-SProcShapeRectangles (client)
- ClientPtr client;
+SProcShapeRectangles (ClientPtr client)
{
char n;
REQUEST (xShapeRectanglesReq);
@@ -1189,8 +1157,7 @@ SProcShapeRectangles (client)
}
static int
-SProcShapeMask (client)
- ClientPtr client;
+SProcShapeMask (ClientPtr client)
{
char n;
REQUEST (xShapeMaskReq);
@@ -1205,8 +1172,7 @@ SProcShapeMask (client)
}
static int
-SProcShapeCombine (client)
- ClientPtr client;
+SProcShapeCombine (ClientPtr client)
{
char n;
REQUEST (xShapeCombineReq);
@@ -1221,8 +1187,7 @@ SProcShapeCombine (client)
}
static int
-SProcShapeOffset (client)
- ClientPtr client;
+SProcShapeOffset (ClientPtr client)
{
char n;
REQUEST (xShapeOffsetReq);
@@ -1236,8 +1201,7 @@ SProcShapeOffset (client)
}
static int
-SProcShapeQueryExtents (client)
- ClientPtr client;
+SProcShapeQueryExtents (ClientPtr client)
{
char n;
REQUEST (xShapeQueryExtentsReq);
@@ -1249,8 +1213,7 @@ SProcShapeQueryExtents (client)
}
static int
-SProcShapeSelectInput (client)
- ClientPtr client;
+SProcShapeSelectInput (ClientPtr client)
{
char n;
REQUEST (xShapeSelectInputReq);
@@ -1262,8 +1225,7 @@ SProcShapeSelectInput (client)
}
static int
-SProcShapeInputSelected (client)
- ClientPtr client;
+SProcShapeInputSelected (ClientPtr client)
{
int n;
REQUEST (xShapeInputSelectedReq);
@@ -1275,8 +1237,7 @@ SProcShapeInputSelected (client)
}
static int
-SProcShapeGetRectangles (client)
- ClientPtr client;
+SProcShapeGetRectangles (ClientPtr client)
{
REQUEST(xShapeGetRectanglesReq);
char n;
@@ -1288,8 +1249,7 @@ SProcShapeGetRectangles (client)
}
static int
-SProcShapeDispatch (client)
- ClientPtr client;
+SProcShapeDispatch (ClientPtr client)
{
REQUEST(xReq);
switch (stuff->data) {
diff --git a/Xext/sleepuntil.c b/Xext/sleepuntil.c
index bedb6f6..4d2a333 100644
--- a/Xext/sleepuntil.c
+++ b/Xext/sleepuntil.c
@@ -78,13 +78,10 @@ static void SertafiedWakeupHandler(
);
int
-ClientSleepUntil (client, revive, notifyFunc, closure)
- ClientPtr client;
- TimeStamp *revive;
- void (*notifyFunc)(
- ClientPtr /* client */,
- pointer /* closure */);
- pointer closure;
+ClientSleepUntil (ClientPtr client,
+ TimeStamp *revive,
+ void (*notifyFunc)(ClientPtr, pointer),
+ pointer closure)
{
SertafiedPtr pRequest, pReq, pPrev;
@@ -138,9 +135,7 @@ ClientSleepUntil (client, revive, notifyFunc, closure)
}
static void
-ClientAwaken (client, closure)
- ClientPtr client;
- pointer closure;
+ClientAwaken (ClientPtr client, pointer closure)
{
if (!client->clientGone)
AttendClient (client);
@@ -148,9 +143,7 @@ ClientAwaken (client, closure)
static int
-SertafiedDelete (value, id)
- pointer value;
- XID id;
+SertafiedDelete (pointer value, XID id)
{
SertafiedPtr pRequest = (SertafiedPtr)value;
SertafiedPtr pReq, pPrev;
@@ -172,10 +165,7 @@ SertafiedDelete (value, id)
}
static void
-SertafiedBlockHandler (data, wt, LastSelectMask)
- pointer data; /* unused */
- OSTimePtr wt; /* wait time */
- pointer LastSelectMask;
+SertafiedBlockHandler (pointer data, OSTimePtr wt, pointer LastSelectMask)
{
SertafiedPtr pReq, pNext;
unsigned long delay;
@@ -208,10 +198,7 @@ SertafiedBlockHandler (data, wt, LastSelectMask)
}
static void
-SertafiedWakeupHandler (data, i, LastSelectMask)
- pointer data;
- int i;
- pointer LastSelectMask;
+SertafiedWakeupHandler (pointer data, int i, pointer LastSelectMask)
{
SertafiedPtr pReq, pNext;
TimeStamp now;
diff --git a/Xext/sync.c b/Xext/sync.c
index f8870a7..d0e7f95 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -852,19 +852,17 @@ static int FreeCounter(void *, XID);
*/
pointer
-SyncCreateSystemCounter(name, initial, resolution, counterType,
- QueryValue, BracketValues)
- char *name;
- CARD64 initial;
- CARD64 resolution;
- SyncCounterType counterType;
- void (*QueryValue) (
- pointer /* pCounter */,
- CARD64 * /* pValue_return */);
- void (*BracketValues) (
- pointer /* pCounter */,
- CARD64 * /* pbracket_less */,
- CARD64 * /* pbracket_greater */);
+SyncCreateSystemCounter(
+ char *name,
+ CARD64 initial,
+ CARD64 resolution,
+ SyncCounterType counterType,
+ void (*QueryValue)(pointer /* pCounter */,
+ CARD64 * /* pValue_return */),
+ void (*BracketValues)(pointer /* pCounter */,
+ CARD64 * /* pbracket_less */,
+ CARD64 * /* pbracket_greater */)
+ )
{
SyncCounter *pCounter;
@@ -911,8 +909,7 @@ SyncCreateSystemCounter(name, initial, resolution, counterType,
}
void
-SyncDestroySystemCounter(pSysCounter)
- pointer pSysCounter;
+SyncDestroySystemCounter(pointer pSysCounter)
{
SyncCounter *pCounter = (SyncCounter *)pSysCounter;
FreeResource(pCounter->id, RT_NONE);
diff --git a/Xext/xace.c b/Xext/xace.c
index 7e82f81..86d70fe 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -244,15 +244,14 @@ int XaceHook(int hook, ...)
* region of the window will be destroyed (overwritten) in pBuf.
*/
void
-XaceCensorImage(client, pVisibleRegion, widthBytesLine, pDraw, x, y, w, h,
- format, pBuf)
- ClientPtr client;
- RegionPtr pVisibleRegion;
- long widthBytesLine;
- DrawablePtr pDraw;
- int x, y, w, h;
- unsigned int format;
- char * pBuf;
+XaceCensorImage(
+ ClientPtr client,
+ RegionPtr pVisibleRegion,
+ long widthBytesLine,
+ DrawablePtr pDraw,
+ int x, int y, int w, int h,
+ unsigned int format,
+ char *pBuf)
{
ScreenPtr pScreen;
RegionRec imageRegion; /* region representing x,y,w,h */
diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index 4f92896..aed2e4e 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -64,8 +64,7 @@ XCMiscExtensionInit(INITARGS)
}
static int
-ProcXCMiscGetVersion(client)
- ClientPtr client;
+ProcXCMiscGetVersion(ClientPtr client)
{
xXCMiscGetVersionReply rep;
int n;
@@ -86,8 +85,7 @@ ProcXCMiscGetVersion(client)
}
static int
-ProcXCMiscGetXIDRange(client)
- ClientPtr client;
+ProcXCMiscGetXIDRange(ClientPtr client)
{
xXCMiscGetXIDRangeReply rep;
int n;
@@ -110,8 +108,7 @@ ProcXCMiscGetXIDRange(client)
}
static int
-ProcXCMiscGetXIDList(client)
- ClientPtr client;
+ProcXCMiscGetXIDList(ClientPtr client)
{
REQUEST(xXCMiscGetXIDListReq);
xXCMiscGetXIDListReply rep;
@@ -150,8 +147,7 @@ ProcXCMiscGetXIDList(client)
}
static int
-ProcXCMiscDispatch (client)
- ClientPtr client;
+ProcXCMiscDispatch (ClientPtr client)
{
REQUEST(xReq);
switch (stuff->data)
@@ -168,8 +164,7 @@ ProcXCMiscDispatch (client)
}
static int
-SProcXCMiscGetVersion(client)
- ClientPtr client;
+SProcXCMiscGetVersion(ClientPtr client)
{
int n;
REQUEST(xXCMiscGetVersionReq);
@@ -182,8 +177,7 @@ SProcXCMiscGetVersion(client)
}
static int
-SProcXCMiscGetXIDRange(client)
- ClientPtr client;
+SProcXCMiscGetXIDRange(ClientPtr client)
{
int n;
REQUEST(xReq);
@@ -193,8 +187,7 @@ SProcXCMiscGetXIDRange(client)
}
static int
-SProcXCMiscGetXIDList(client)
- ClientPtr client;
+SProcXCMiscGetXIDList(ClientPtr client)
{
int n;
REQUEST(xXCMiscGetXIDListReq);
@@ -205,8 +198,7 @@ SProcXCMiscGetXIDList(client)
}
static int
-SProcXCMiscDispatch (client)
- ClientPtr client;
+SProcXCMiscDispatch (ClientPtr client)
{
REQUEST(xReq);
switch (stuff->data)
diff --git a/Xext/xtest.c b/Xext/xtest.c
index c6980f0..2383a87 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -83,8 +83,7 @@ XTestExtensionInit(INITARGS)
}
static int
-ProcXTestGetVersion(client)
- ClientPtr client;
+ProcXTestGetVersion(ClientPtr client)
{
xXTestGetVersionReply rep;
int n;
@@ -104,8 +103,7 @@ ProcXTestGetVersion(client)
}
static int
-ProcXTestCompareCursor(client)
- ClientPtr client;
+ProcXTestCompareCursor(ClientPtr client)
{
REQUEST(xXTestCompareCursorReq);
xXTestCompareCursorReply rep;
@@ -143,8 +141,7 @@ ProcXTestCompareCursor(client)
}
static int
-ProcXTestFakeInput(client)
- ClientPtr client;
+ProcXTestFakeInput(ClientPtr client)
{
REQUEST(xXTestFakeInputReq);
int nev, n, type, rc;
@@ -402,8 +399,7 @@ ProcXTestFakeInput(client)
}
static int
-ProcXTestGrabControl(client)
- ClientPtr client;
+ProcXTestGrabControl(ClientPtr client)
{
REQUEST(xXTestGrabControlReq);
@@ -421,8 +417,7 @@ ProcXTestGrabControl(client)
}
static int
-ProcXTestDispatch (client)
- ClientPtr client;
+ProcXTestDispatch (ClientPtr client)
{
REQUEST(xReq);
switch (stuff->data)
@@ -441,8 +436,7 @@ ProcXTestDispatch (client)
}
static int
-SProcXTestGetVersion(client)
- ClientPtr client;
+SProcXTestGetVersion(ClientPtr client)
{
int n;
REQUEST(xXTestGetVersionReq);
@@ -454,8 +448,7 @@ SProcXTestGetVersion(client)
}
static int
-SProcXTestCompareCursor(client)
- ClientPtr client;
+SProcXTestCompareCursor(ClientPtr client)
{
int n;
REQUEST(xXTestCompareCursorReq);
@@ -468,9 +461,7 @@ SProcXTestCompareCursor(client)
}
static int
-XTestSwapFakeInput(client, req)
- ClientPtr client;
- xReq *req;
+XTestSwapFakeInput(ClientPtr client, xReq *req)
{
int nev;
xEvent *ev;
@@ -494,8 +485,7 @@ XTestSwapFakeInput(client, req)
}
static int
-SProcXTestFakeInput(client)
- ClientPtr client;
+SProcXTestFakeInput(ClientPtr client)
{
int n;
REQUEST(xReq);
@@ -508,8 +498,7 @@ SProcXTestFakeInput(client)
}
static int
-SProcXTestGrabControl(client)
- ClientPtr client;
+SProcXTestGrabControl(ClientPtr client)
{
int n;
REQUEST(xXTestGrabControlReq);
@@ -520,8 +509,7 @@ SProcXTestGrabControl(client)
}
static int
-SProcXTestDispatch (client)
- ClientPtr client;
+SProcXTestDispatch (ClientPtr client)
{
REQUEST(xReq);
switch (stuff->data)
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index f5c80f3..6184e4e 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -520,12 +520,7 @@ XvdiDestroyEncoding(pointer value, XID id)
}
static int
-XvdiSendVideoNotify(pPort, pDraw, reason)
-
-XvPortPtr pPort;
-DrawablePtr pDraw;
-int reason;
-
+XvdiSendVideoNotify(XvPortPtr pPort, DrawablePtr pDraw, int reason)
{
xvEvent event;
XvVideoNotifyPtr pn;
commit 7a05c8b1e70680ddd3b3e09ad448788f8d70a428
Author: Julien Cristau <jcristau at debian.org>
Date: Tue Dec 23 13:08:49 2008 +0100
xfree86/linux: fix log flood on acpid open error
When we can't open the acpid socket, warn once, not once every second
diff --git a/hw/xfree86/os-support/linux/lnx_acpi.c b/hw/xfree86/os-support/linux/lnx_acpi.c
index bb975cc..8e11f4a 100644
--- a/hw/xfree86/os-support/linux/lnx_acpi.c
+++ b/hw/xfree86/os-support/linux/lnx_acpi.c
@@ -133,6 +133,7 @@ lnxACPIOpen(void)
int fd;
struct sockaddr_un addr;
int r = -1;
+ static int warned = 0;
#ifdef DEBUG
ErrorF("ACPI: OSPMOpen called\n");
@@ -148,8 +149,10 @@ lnxACPIOpen(void)
addr.sun_family = AF_UNIX;
strcpy(addr.sun_path, ACPI_SOCKET);
if ((r = connect(fd, (struct sockaddr*)&addr, sizeof(addr))) == -1) {
- xf86MsgVerb(X_WARNING,3,"Open ACPI failed (%s) (%s)\n", ACPI_SOCKET,
- strerror(errno));
+ if (!warned)
+ xf86MsgVerb(X_WARNING,3,"Open ACPI failed (%s) (%s)\n",
+ ACPI_SOCKET, strerror(errno));
+ warned = 1;
shutdown(fd, 2);
close(fd);
return NULL;
@@ -160,6 +163,7 @@ lnxACPIOpen(void)
xf86PMConfirmEventToOs = lnxACPIConfirmEventToOs;
ACPIihPtr = xf86AddGeneralHandler(fd,xf86HandlePMEvents,NULL);
xf86MsgVerb(X_INFO,3,"Open ACPI successful (%s)\n", ACPI_SOCKET);
+ warned = 0;
return lnxCloseACPI;
}
More information about the xorg-commit
mailing list