andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Big old pile of warning fixes.

Browse Source
This commit is contained in:
Adam Jackson 2006-03-28 01:21:00 +00:00
parent 7342dbe4b2
commit 7deaaa797c
18 changed files with 149 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ChangeLog
View File

@ -5,6 +5,25 @@
* mi/miscrinit.c:
Remove long-dead screen region code.
* Xext/panoramiX.c:
* Xext/security.c:
* Xext/xevie.c:
* Xprint/AttrValid.h:
* Xprint/Oid.h:
* dbe/dbe.c:
* dbe/midbe.c:
* dix/devices.c:
* dix/events.c:
* dix/window.c:
* mi/miarc.c:
* mi/mioverlay.c:
* miext/shadow/shadow.h:
* os/connection.c:
* os/xdmauth.c:
* record/record.c:
* render/mipict.c:
Big old pile of warning fixes.
2006-03-25 Daniel Stone <daniel@freedesktop.org>
* xkb/xkbUtils.c:

1
Xext/panoramiX.c
View File

@ -1176,7 +1176,6 @@ XineramaGetImageData(
BoxRec SrcBox, *pbox;
int x, y, w, h, i, j, nbox, size, sizeNeeded, ScratchPitch, inOut, depth;
DrawablePtr pDraw = pDrawables[0];
ScreenPtr pScreen = pDraw->pScreen;
char *ScratchMem = NULL;
size = 0;

3
Xext/security.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/Xext/security.c,v 1.3 2005/04/20 12:25:12 daniels Exp $ */
/* $XdotOrg: xserver/xorg/Xext/security.c,v 1.5 2005/07/03 07:01:04 daniels Exp $ */
/* $Xorg: security.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
/*
@ -1225,7 +1225,6 @@ SecurityCensorImage(client, pVisibleRegion, widthBytesLine, pDraw, x, y, w, h,
unsigned int format;
char * pBuf;
{
ScreenPtr pScreen = pDraw->pScreen;
RegionRec imageRegion; /* region representing x,y,w,h */
RegionRec censorRegion; /* region to obliterate */
BoxRec imageBox;

54
Xext/xevie.c
View File

@ -30,7 +30,7 @@ or other dealings in this Software without prior written authorization
of the copyright holder.
************************************************************/
/* $XdotOrg: xc/programs/Xserver/Xext/xevie.c,v 1.6 2005/05/22 01:12:49 alanc Exp $ */
/* $XdotOrg: xserver/xorg/Xext/xevie.c,v 1.11 2005/10/06 17:55:54 alanc Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS
@ -62,8 +62,8 @@ of the copyright holder.
extern Bool noXkbExtension;
extern int xeviegrabState;
static int ProcDispatch (), SProcDispatch ();
static void ResetProc ();
static int ProcDispatch (register ClientPtr client), SProcDispatch (register ClientPtr client);
static void ResetProc (ExtensionEntry *extEntry);
static unsigned char ReqCode = 0;
static int ErrorBase;
@ -129,7 +129,7 @@ static void XeviePointerProcessInputProc(xEvent *xE, DeviceIntPtr dev,
static void XevieKbdProcessInputProc(xEvent *xE, DeviceIntPtr dev, int count);
void
XevieExtensionInit ()
XevieExtensionInit (void)
{
ExtensionEntry* extEntry;
@ -158,18 +158,15 @@ XevieExtensionInit ()
/*ARGSUSED*/
static
void ResetProc (extEntry)
ExtensionEntry* extEntry;
void ResetProc (ExtensionEntry *extEntry)
{
}
static
int ProcQueryVersion (client)
register ClientPtr client;
int ProcQueryVersion (register ClientPtr client)
{
REQUEST (xXevieQueryVersionReq);
xXevieQueryVersionReply rep;
register int n;
REQUEST_SIZE_MATCH (xXevieQueryVersionReq);
rep.type = X_Reply;
@ -182,12 +179,10 @@ int ProcQueryVersion (client)
}
static
int ProcStart (client)
register ClientPtr client;
int ProcStart (register ClientPtr client)
{
REQUEST (xXevieStartReq);
xXevieStartReply rep;
register int n;
REQUEST_SIZE_MATCH (xXevieStartReq);
rep.pad1 = 0;
@ -224,8 +219,7 @@ int ProcStart (client)
}
static
int ProcEnd (client)
register ClientPtr client;
int ProcEnd (register ClientPtr client)
{
xXevieEndReply rep;
@ -244,13 +238,11 @@ int ProcEnd (client)
}
static
int ProcSend (client)
register ClientPtr client;
int ProcSend (register ClientPtr client)
{
REQUEST (xXevieSendReq);
xXevieSendReply rep;
xEvent *xE;
OsCommPtr oc;
static unsigned char lastDetail = 0, lastType = 0;
if (client->index != xevieClientIndex)
@ -288,8 +280,7 @@ int ProcSend (client)
}
static
int ProcSelectInput (client)
register ClientPtr client;
int ProcSelectInput (register ClientPtr client)
{
REQUEST (xXevieSelectInputReq);
xXevieSelectInputReply rep;
@ -305,8 +296,7 @@ int ProcSelectInput (client)
}
static
int ProcDispatch (client)
register ClientPtr client;
int ProcDispatch (register ClientPtr client)
{
REQUEST (xReq);
switch (stuff->data)
@ -327,8 +317,7 @@ int ProcDispatch (client)
}
static
int SProcQueryVersion (client)
register ClientPtr client;
int SProcQueryVersion (register ClientPtr client)
{
register int n;
@ -338,8 +327,7 @@ int SProcQueryVersion (client)
}
static
int SProcStart (client)
ClientPtr client;
int SProcStart (ClientPtr client)
{
register int n;
@ -351,12 +339,9 @@ int SProcStart (client)
}
static
int SProcEnd (client)
ClientPtr client;
int SProcEnd (ClientPtr client)
{
register int n;
int count;
xColorItem* pItem;
REQUEST (xXevieEndReq);
swaps (&stuff->length, n);
@ -366,11 +351,9 @@ int SProcEnd (client)
}
static
int SProcSend (client)
ClientPtr client;
int SProcSend (ClientPtr client)
{
register int n;
int count;
REQUEST (xXevieSendReq);
swaps (&stuff->length, n);
@ -380,11 +363,9 @@ int SProcSend (client)
}
static
int SProcSelectInput (client)
ClientPtr client;
int SProcSelectInput (ClientPtr client)
{
register int n;
int count;
REQUEST (xXevieSelectInputReq);
swaps (&stuff->length, n);
@ -395,8 +376,7 @@ int SProcSelectInput (client)
static
int SProcDispatch (client)
register ClientPtr client;
int SProcDispatch (register ClientPtr client)
{
REQUEST(xReq);
switch (stuff->data)

2
Xprint/AttrValid.h
View File

@ -182,7 +182,7 @@ void XpPutMediumSSAttr(XpContextPtr pContext,
XPAttributes pool,
XpOid oid,
const XpOidMediumSS* msss);
const XpOidMediumSS* XpGetDefaultMediumSS();
const XpOidMediumSS* XpGetDefaultMediumSS(void);
/*
* XpOidTrayMediumList-valued attribute access

2
Xprint/Oid.h
View File

@ -210,7 +210,7 @@ char* XpOidListString(const XpOidList*);
/*
* XpOidLinkedList public methods
*/
XpOidLinkedList* XpOidLinkedListNew();
XpOidLinkedList* XpOidLinkedListNew(void);
void XpOidLinkedListDelete(XpOidLinkedList*);
#define XpOidLinkedListCount(l) ((l) ? (l)->count : 0)
XpOid XpOidLinkedListGetOid(XpOidLinkedList* list, int i);

93
dbe/dbe.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xserver/xorg/dbe/dbe.c,v 1.5 2005/07/03 07:01:17 daniels Exp $ */
/* $XdotOrg: xserver/xorg/dbe/dbe.c,v 1.6 2006/02/10 22:00:21 anholt Exp $ */
/* $Xorg: dbe.c,v 1.3 2000/08/17 19:48:16 cpqbld Exp $ */
/******************************************************************************
*
@ -100,10 +100,7 @@ static Bool firstRegistrationPass = TRUE;
*****************************************************************************/
void
DbeValidateBuffer(pWin, drawID, dstbuf)
WindowPtr pWin;
XID drawID;
Bool dstbuf;
DbeValidateBuffer(WindowPtr pWin, XID drawID, Bool dstbuf)
{
DbeScreenPrivPtr pDbeScreenPriv = DBE_SCREEN_PRIV_FROM_WINDOW(pWin);
if (pDbeScreenPriv->ValidateBuffer)
@ -122,9 +119,7 @@ DbeValidateBuffer(pWin, drawID, dstbuf)
*****************************************************************************/
void
DbeRegisterFunction(pScreen, funct)
ScreenPtr pScreen;
Bool (*funct)();
DbeRegisterFunction(ScreenPtr pScreen, Bool (*funct) (/* ??? */))
{
int i;
@ -158,8 +153,7 @@ DbeRegisterFunction(pScreen, funct)
*
*****************************************************************************/
static DbeWindowPrivPtr
DbeAllocWinPriv(pScreen)
ScreenPtr pScreen;
DbeAllocWinPriv(ScreenPtr pScreen)
{
DbeWindowPrivPtr pDbeWindowPriv;
DbeScreenPrivPtr pDbeScreenPriv;
@ -228,7 +222,7 @@ DbeFallbackAllocWinPriv(pScreen)
*****************************************************************************/
static int
DbeAllocWinPrivPrivIndex()
DbeAllocWinPrivPrivIndex(void)
{
return winPrivPrivCount++;
@ -248,10 +242,7 @@ DbeAllocWinPrivPrivIndex()
*****************************************************************************/
static Bool
DbeAllocWinPrivPriv(pScreen, index, amount)
register ScreenPtr pScreen;
int index;
unsigned int amount;
DbeAllocWinPrivPriv(register ScreenPtr pScreen, int index, unsigned int amount)
{
DbeScreenPrivPtr pDbeScreenPriv;
unsigned int oldamount;
@ -302,9 +293,7 @@ DbeAllocWinPrivPriv(pScreen, index, amount)
*****************************************************************************/
static void
DbeStubScreen(pDbeScreenPriv, nStubbedScreens)
DbeScreenPrivPtr pDbeScreenPriv;
int *nStubbedScreens;
DbeStubScreen(DbeScreenPrivPtr pDbeScreenPriv, int *nStubbedScreens)
{
/* Stub DIX. */
pDbeScreenPriv->SetupBackgroundPainter = NULL;
@ -351,8 +340,7 @@ DbeStubScreen(pDbeScreenPriv, nStubbedScreens)
*****************************************************************************/
static int
ProcDbeGetVersion(client)
ClientPtr client;
ProcDbeGetVersion(ClientPtr client)
{
/* REQUEST(xDbeGetVersionReq); */
xDbeGetVersionReply rep;
@ -403,8 +391,7 @@ ProcDbeGetVersion(client)
*****************************************************************************/
static int
ProcDbeAllocateBackBufferName(client)
ClientPtr client;
ProcDbeAllocateBackBufferName(ClientPtr client)
{
REQUEST(xDbeAllocateBackBufferNameReq);
WindowPtr pWin;
@ -638,8 +625,7 @@ ProcDbeAllocateBackBufferName(client)
*****************************************************************************/
static int
ProcDbeDeallocateBackBufferName(client)
ClientPtr client;
ProcDbeDeallocateBackBufferName(ClientPtr client)
{
REQUEST(xDbeDeallocateBackBufferNameReq);
DbeWindowPrivPtr pDbeWindowPriv;
@ -710,8 +696,7 @@ ProcDbeDeallocateBackBufferName(client)
*****************************************************************************/
static int
ProcDbeSwapBuffers(client)
ClientPtr client;
ProcDbeSwapBuffers(ClientPtr client)
{
REQUEST(xDbeSwapBuffersReq);
WindowPtr pWin;
@ -835,8 +820,7 @@ ProcDbeSwapBuffers(client)
*****************************************************************************/
static int
ProcDbeBeginIdiom(client)
ClientPtr client;
ProcDbeBeginIdiom(ClientPtr client)
{
/* REQUEST(xDbeBeginIdiomReq); */
DbeScreenPrivPtr pDbeScreenPriv;
@ -879,8 +863,7 @@ ProcDbeBeginIdiom(client)
*****************************************************************************/
static int
ProcDbeGetVisualInfo(client)
ClientPtr client;
ProcDbeGetVisualInfo(ClientPtr client)
{
REQUEST(xDbeGetVisualInfoReq);
DbeScreenPrivPtr pDbeScreenPriv;
@ -1056,8 +1039,7 @@ ProcDbeGetVisualInfo(client)
*****************************************************************************/
static int
ProcDbeGetBackBufferAttributes(client)
ClientPtr client;
ProcDbeGetBackBufferAttributes(ClientPtr client)
{
REQUEST(xDbeGetBackBufferAttributesReq);
xDbeGetBackBufferAttributesReply rep;
@ -1106,8 +1088,7 @@ ProcDbeGetBackBufferAttributes(client)
*****************************************************************************/
static int
ProcDbeDispatch(client)
ClientPtr client;
ProcDbeDispatch(ClientPtr client)
{
REQUEST(xReq);
@ -1162,8 +1143,7 @@ ProcDbeDispatch(client)
*****************************************************************************/
static int
SProcDbeGetVersion(client)
ClientPtr client;
SProcDbeGetVersion(ClientPtr client)
{
REQUEST(xDbeGetVersionReq);
register int n;
@ -1199,8 +1179,7 @@ SProcDbeGetVersion(client)
*****************************************************************************/
static int
SProcDbeAllocateBackBufferName(client)
ClientPtr client;
SProcDbeAllocateBackBufferName(ClientPtr client)
{
REQUEST(xDbeAllocateBackBufferNameReq);
register int n;
@ -1235,8 +1214,7 @@ SProcDbeAllocateBackBufferName(client)
*****************************************************************************/
static int
SProcDbeDeallocateBackBufferName(client)
ClientPtr client;
SProcDbeDeallocateBackBufferName(ClientPtr client)
{
REQUEST (xDbeDeallocateBackBufferNameReq);
register int n;
@ -1274,8 +1252,7 @@ SProcDbeDeallocateBackBufferName(client)
*****************************************************************************/
static int
SProcDbeSwapBuffers(client)
ClientPtr client;
SProcDbeSwapBuffers(ClientPtr client)
{
REQUEST(xDbeSwapBuffersReq);
register int i, n;
@ -1323,8 +1300,7 @@ SProcDbeSwapBuffers(client)
*****************************************************************************/
static int
SProcDbeBeginIdiom(client)
ClientPtr client;
SProcDbeBeginIdiom(ClientPtr client)
{
REQUEST(xDbeBeginIdiomReq);
register int n;
@ -1353,8 +1329,7 @@ SProcDbeBeginIdiom(client)
*****************************************************************************/
static int
SProcDbeGetVisualInfo(client)
ClientPtr client;
SProcDbeGetVisualInfo(ClientPtr client)
{
REQUEST(xDbeGetVisualInfoReq);
register int n;
@ -1388,8 +1363,7 @@ SProcDbeGetVisualInfo(client)
*****************************************************************************/
static int
SProcDbeGetBackBufferAttributes(client)
ClientPtr client;
SProcDbeGetBackBufferAttributes(ClientPtr client)
{
REQUEST (xDbeGetBackBufferAttributesReq);
register int n;
@ -1415,8 +1389,7 @@ SProcDbeGetBackBufferAttributes(client)
*****************************************************************************/
static int
SProcDbeDispatch(client)
ClientPtr client;
SProcDbeDispatch(ClientPtr client)
{
REQUEST(xReq);
@ -1470,9 +1443,7 @@ SProcDbeDispatch(client)
*****************************************************************************/
static Bool
DbeSetupBackgroundPainter(pWin, pGC)
WindowPtr pWin;
GCPtr pGC;
DbeSetupBackgroundPainter(WindowPtr pWin, GCPtr pGC)
{
pointer gcvalues[4];
int ts_x_origin, ts_y_origin;
@ -1545,9 +1516,7 @@ DbeSetupBackgroundPainter(pWin, pGC)
*
*****************************************************************************/
static int
DbeDrawableDelete(pDrawable, id)
pointer pDrawable;
XID id;
DbeDrawableDelete(pointer pDrawable, XID id)
{
return(Success);
@ -1566,9 +1535,7 @@ DbeDrawableDelete(pDrawable, id)
*
*****************************************************************************/
static int
DbeWindowPrivDelete(pDbeWinPriv, id)
pointer pDbeWinPriv;
XID id;
DbeWindowPrivDelete(pointer pDbeWinPriv, XID id)
{
DbeScreenPrivPtr pDbeScreenPriv;
DbeWindowPrivPtr pDbeWindowPriv = (DbeWindowPrivPtr)pDbeWinPriv;
@ -1675,8 +1642,7 @@ DbeWindowPrivDelete(pDbeWinPriv, id)
*
*****************************************************************************/
static void
DbeResetProc(extEntry)
ExtensionEntry *extEntry;
DbeResetProc(ExtensionEntry *extEntry)
{
int i;
ScreenPtr pScreen;
@ -1731,8 +1697,7 @@ DbeResetProc(extEntry)
*****************************************************************************/
static Bool
DbeDestroyWindow(pWin)
WindowPtr pWin;
DbeDestroyWindow(WindowPtr pWin)
{
DbeScreenPrivPtr pDbeScreenPriv;
DbeWindowPrivPtr pDbeWindowPriv;
@ -1814,7 +1779,7 @@ DbeDestroyWindow(pWin)
*****************************************************************************/
void
DbeExtensionInit()
DbeExtensionInit(void)
{
ExtensionEntry *extEntry;
register int i, j;

41
dbe/midbe.c
View File

@ -57,6 +57,7 @@
#include "regionstr.h"
#include "gcstruct.h"
#include "inputstr.h"
#include "midbe.h"
#include <stdio.h>
@ -94,9 +95,7 @@ int dbeWindowPrivIndex = -1;
*****************************************************************************/
static Bool
miDbeGetVisualInfo(pScreen, pScrVisInfo)
ScreenPtr pScreen;
XdbeScreenVisualInfo *pScrVisInfo;
miDbeGetVisualInfo(ScreenPtr pScreen, XdbeScreenVisualInfo *pScrVisInfo)
{
register int i, j, k;
register int count;
@ -158,10 +157,7 @@ miDbeGetVisualInfo(pScreen, pScrVisInfo)
*****************************************************************************/
static int
miDbeAllocBackBufferName(pWin, bufId, swapAction)
WindowPtr pWin;
XID bufId;
int swapAction;
miDbeAllocBackBufferName(WindowPtr pWin, XID bufId, int swapAction)
{
ScreenPtr pScreen;
DbeWindowPrivPtr pDbeWindowPriv;
@ -272,8 +268,7 @@ miDbeAllocBackBufferName(pWin, bufId, swapAction)
*****************************************************************************/
static void
miDbeAliasBuffers(pDbeWindowPriv)
DbeWindowPrivPtr pDbeWindowPriv;
miDbeAliasBuffers(DbeWindowPrivPtr pDbeWindowPriv)
{
int i;
MiDbeWindowPrivPrivPtr pDbeWindowPrivPriv =
@ -299,10 +294,7 @@ miDbeAliasBuffers(pDbeWindowPriv)
*****************************************************************************/
static int
miDbeSwapBuffers(client, pNumWindows, swapInfo)
ClientPtr client;
int *pNumWindows;
DbeSwapInfoPtr swapInfo;
miDbeSwapBuffers(ClientPtr client, int *pNumWindows, DbeSwapInfoPtr swapInfo)
{
DbeScreenPrivPtr pDbeScreenPriv;
GCPtr pGC;
@ -481,9 +473,7 @@ miDbeSwapBuffers(client, pNumWindows, swapInfo)
*****************************************************************************/
static void
miDbeWinPrivDelete(pDbeWindowPriv, bufId)
DbeWindowPrivPtr pDbeWindowPriv;
XID bufId;
miDbeWinPrivDelete(DbeWindowPrivPtr pDbeWindowPriv, XID bufId)
{
MiDbeWindowPrivPrivPtr pDbeWindowPrivPriv;
@ -530,10 +520,7 @@ miDbeWinPrivDelete(pDbeWindowPriv, bufId)
*****************************************************************************/
static Bool
miDbePositionWindow(pWin, x, y)
WindowPtr pWin;
int x;
int y;
miDbePositionWindow(WindowPtr pWin, int x, int y)
{
ScreenPtr pScreen;
DbeScreenPrivPtr pDbeScreenPriv;
@ -771,8 +758,7 @@ miDbePositionWindow(pWin, x, y)
*****************************************************************************/
static void
miDbeResetProc(pScreen)
ScreenPtr pScreen;
miDbeResetProc(ScreenPtr pScreen)
{
DbeScreenPrivPtr pDbeScreenPriv;
@ -784,6 +770,11 @@ miDbeResetProc(pScreen)
} /* miDbeResetProc() */
static void
miDbeNopValidateBuffer(WindowPtr pWin, XID bufId, Bool dstbuffer)
{
}
/******************************************************************************
*
@ -796,9 +787,7 @@ miDbeResetProc(pScreen)
*****************************************************************************/
Bool
miDbeInit(pScreen, pDbeScreenPriv)
ScreenPtr pScreen;
DbeScreenPrivPtr pDbeScreenPriv;
miDbeInit(ScreenPtr pScreen, DbeScreenPrivPtr pDbeScreenPriv)
{
/* Copy resource types created by DIX */
dbeDrawableResType = pDbeScreenPriv->dbeDrawableResType;
@ -844,7 +833,7 @@ miDbeInit(pScreen, pDbeScreenPriv)
pDbeScreenPriv->WinPrivDelete = miDbeWinPrivDelete;
/* The mi implementation doesn't need buffer validation. */
pDbeScreenPriv->ValidateBuffer = (void (*)())NoopDDA;
pDbeScreenPriv->ValidateBuffer = miDbeNopValidateBuffer;
return(TRUE);

5
dix/devices.c
View File

@ -48,7 +48,7 @@ SOFTWARE.
/* $Xorg: devices.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */
/* $XdotOrg: xserver/xorg/dix/devices.c,v 1.8 2005/07/03 08:53:38 daniels Exp $ */
/* $XdotOrg: xserver/xorg/dix/devices.c,v 1.9 2006/02/15 20:44:12 ajax Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
@ -126,7 +126,8 @@ _AddInputDevice(DeviceProc deviceProc, Bool autoStart)
dev->xkb_interest= NULL;
#endif
dev->nPrivates = 0;
dev->devPrivates = dev->unwrapProc = NULL;
dev->devPrivates = NULL;
dev->unwrapProc = NULL;
inputInfo.off_devices = dev;
return dev;
}

3
dix/events.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xserver/xorg/dix/events.c,v 1.17 2005/08/25 22:11:04 anholt Exp $ */
/* $XdotOrg: xserver/xorg/dix/events.c,v 1.18 2006/02/15 20:44:12 ajax Exp $ */
/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.51 2004/01/12 17:04:52 tsi Exp $ */
/************************************************************
@ -2140,7 +2140,6 @@ WindowsRestructured()
* compute correctly. */
void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff)
{
ScreenPtr pScreen = win->drawable.pScreen;
GrabPtr grab;
if (noPanoramiXExtension) return;

10
dix/window.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xserver/xorg/dix/window.c,v 1.13 2006/01/12 22:14:56 sandmann Exp $ */
/* $XdotOrg: xserver/xorg/dix/window.c,v 1.14 2006/02/15 20:44:12 ajax Exp $ */
/* $Xorg: window.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */
/*
@ -512,7 +512,6 @@ ClippedRegionFromBox(register WindowPtr pWin, RegionPtr Rgn,
register int x, register int y,
register int w, register int h)
{
ScreenPtr pScreen = pWin->drawable.pScreen;
BoxRec box;
box = *(REGION_EXTENTS(pScreen, &pWin->winSize));
@ -1611,8 +1610,6 @@ CreateUnclippedWinSize (register WindowPtr pWin)
pRgn = REGION_CREATE(pWin->drawable.pScreen, &box, 1);
#ifdef SHAPE
if (wBoundingShape (pWin) || wClipShape (pWin)) {
ScreenPtr pScreen = pWin->drawable.pScreen;
REGION_TRANSLATE(pScreen, pRgn, - pWin->drawable.x,
- pWin->drawable.y);
if (wBoundingShape (pWin))
@ -1647,8 +1644,6 @@ SetWinSize (register WindowPtr pWin)
(int)pWin->drawable.height);
#ifdef SHAPE
if (wBoundingShape (pWin) || wClipShape (pWin)) {
ScreenPtr pScreen = pWin->drawable.pScreen;
REGION_TRANSLATE(pScreen, &pWin->winSize, - pWin->drawable.x,
- pWin->drawable.y);
if (wBoundingShape (pWin))
@ -1689,8 +1684,6 @@ SetBorderSize (register WindowPtr pWin)
(int)(pWin->drawable.height + (bw<<1)));
#ifdef SHAPE
if (wBoundingShape (pWin)) {
ScreenPtr pScreen = pWin->drawable.pScreen;
REGION_TRANSLATE(pScreen, &pWin->borderSize, - pWin->drawable.x,
- pWin->drawable.y);
REGION_INTERSECT(pScreen, &pWin->borderSize, &pWin->borderSize,
@ -1900,7 +1893,6 @@ MakeBoundingRegion (
BoxPtr pBox)
{
RegionPtr pRgn;
ScreenPtr pScreen = pWin->drawable.pScreen;
pRgn = REGION_CREATE(pScreen, pBox, 1);
if (wBoundingShape (pWin)) {

6
mi/miarc.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xserver/xorg/mi/miarc.c,v 1.6 2005/07/03 08:53:51 daniels Exp $ */
/* $XdotOrg: xserver/xorg/mi/miarc.c,v 1.7 2006/02/15 19:05:54 ajax Exp $ */
/* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.14 2003/10/29 22:57:48 tsi Exp $ */
/***********************************************************
@ -112,12 +112,12 @@ ICEILTEMPDECL
#endif
#ifdef USE_INLINE
inline static const int max (const int x, const int y)
inline static int max (const int x, const int y)
{
return x>y? x:y;
}
inline static const int min (const int x, const int y)
inline static int min (const int x, const int y)
{
return x<y? x:y;
}

1
mi/mioverlay.c
View File

@ -2029,7 +2029,6 @@ HasUnderlayChildren(WindowPtr pWin)
static Bool
CollectUnderlayChildrenRegions(WindowPtr pWin, RegionPtr pReg)
{
ScreenPtr pScreen = pWin->drawable.pScreen;
WindowPtr pChild;
miOverlayTreePtr pTree;
Bool hasUnderlay;

8
miext/shadow/shadow.h
View File

@ -164,10 +164,18 @@ void
shadowUpdateRotate32_270 (ScreenPtr pScreen,
shadowBufPtr pBuf);
void
shadowUpdateRotate8 (ScreenPtr pScreen,
shadowBufPtr pBuf);
void
shadowUpdateRotate16 (ScreenPtr pScreen,
shadowBufPtr pBuf);
void
shadowUpdateRotate32 (ScreenPtr pScreen,
shadowBufPtr pBuf);
typedef void (* shadowUpdateProc)(ScreenPtr, shadowBufPtr);
shadowUpdateProc shadowUpdatePackedWeak(void);

2
os/connection.c
View File

@ -654,8 +654,10 @@ ClientAuthorized(ClientPtr client,
XID auth_id;
char *reason = NULL;
XtransConnInfo trans_conn;
#ifdef LBX
int restore_trans_conn = 0;
ClientPtr lbxpc = NULL;
#endif
priv = (OsCommPtr)client->osPrivate;
trans_conn = priv->trans_conn;

8
os/xdmauth.c
View File

@ -70,9 +70,7 @@ XdmAuthenticationValidator (ARRAY8Ptr privateData, ARRAY8Ptr incomingData,
XdmcpUnwrap (incomingData->data, &privateKey,
incomingData->data,incomingData->length);
switch (packet_type)
{
case ACCEPT:
if (packet_type == ACCEPT) {
if (incomingData->length != 8)
return FALSE;
incoming = (XdmAuthKeyPtr) incomingData->data;
@ -88,9 +86,7 @@ XdmAuthenticationGenerator (ARRAY8Ptr privateData, ARRAY8Ptr outgoingData,
{
outgoingData->length = 0;
outgoingData->data = 0;
switch (packet_type)
{
case REQUEST:
if (packet_type == REQUEST) {
if (XdmcpAllocARRAY8 (outgoingData, 8))
XdmcpWrap (&rho, &privateKey, outgoingData->data, 8);
}

166
record/record.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xserver/xorg/record/record.c,v 1.5 2005/07/03 07:02:08 daniels Exp $ */
/* $XdotOrg: xserver/xorg/record/record.c,v 1.6 2006/02/10 22:00:30 anholt Exp $ */
/* $Xorg: record.c,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ */
/*
@ -45,6 +45,7 @@ and Jim Haggerty of Metheus.
#define _XRECORD_SERVER_
#include <X11/extensions/recordstr.h>
#include "set.h"
#include "swaprep.h"
#include <stdio.h>
#include <assert.h>
@ -202,8 +203,7 @@ static int numEnabledContexts;
* Side Effects: none.
*/
static int
RecordFindContextOnAllContexts(pContext)
RecordContextPtr pContext;
RecordFindContextOnAllContexts(RecordContextPtr pContext)
{
int i;
@ -465,10 +465,7 @@ RecordFindClientOnContext(
* Note: this function exists mainly to make RecordARequest smaller.
*/
static void
RecordABigRequest(pContext, client, stuff)
RecordContextPtr pContext;
ClientPtr client;
xReq *stuff;
RecordABigRequest(RecordContextPtr pContext, ClientPtr client, xReq *stuff)
{
CARD32 bigLength;
char n;
@ -517,8 +514,7 @@ RecordABigRequest(pContext, client, stuff)
* request for this client. The real Proc function is called.
*/
static int
RecordARequest(client)
ClientPtr client;
RecordARequest(ClientPtr client)
{
RecordContextPtr pContext;
RecordClientsAndProtocolPtr pRCAP;
@ -601,10 +597,7 @@ RecordARequest(client)
* the word skip in ddx.tbl.ms (the porting layer document).
*/
static void
RecordASkippedRequest(pcbl , nulldata, calldata)
CallbackListPtr *pcbl;
pointer nulldata;
pointer calldata;
RecordASkippedRequest(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
{
SkippedRequestInfoRec *psi = (SkippedRequestInfoRec *)calldata;
RecordContextPtr pContext;
@ -691,10 +684,7 @@ RecordASkippedRequest(pcbl , nulldata, calldata)
* chunk of data belonging to this reply, it is set to 0.
*/
static void
RecordAReply(pcbl, nulldata, calldata)
CallbackListPtr *pcbl;
pointer nulldata;
pointer calldata;
RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
{
RecordContextPtr pContext;
RecordClientsAndProtocolPtr pRCAP;
@ -776,10 +766,7 @@ RecordAReply(pcbl, nulldata, calldata)
* it for this client.
*/
static void
RecordADeliveredEventOrError(pcbl, nulldata, calldata)
CallbackListPtr *pcbl;
pointer nulldata;
pointer calldata;
RecordADeliveredEventOrError(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
{
EventInfoRec *pei = (EventInfoRec *)calldata;
RecordContextPtr pContext;
@ -845,10 +832,7 @@ RecordADeliveredEventOrError(pcbl, nulldata, calldata)
* it for this client.
*/
static void
RecordADeviceEvent(pcbl, nulldata, calldata)
CallbackListPtr *pcbl;
pointer nulldata;
pointer calldata;
RecordADeviceEvent(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
{
DeviceEventInfoRec *pei = (DeviceEventInfoRec *)calldata;
RecordContextPtr pContext;
@ -969,9 +953,7 @@ RecordFlushAllContexts(
* various callback lists.
*/
static int
RecordInstallHooks(pRCAP, oneclient)
RecordClientsAndProtocolPtr pRCAP;
XID oneclient;
RecordInstallHooks(RecordClientsAndProtocolPtr pRCAP, XID oneclient)
{
int i = 0;
XID client;
@ -1064,9 +1046,7 @@ RecordInstallHooks(pRCAP, oneclient)
* various callback lists.
*/
static void
RecordUninstallHooks(pRCAP, oneclient)
RecordClientsAndProtocolPtr pRCAP;
XID oneclient;
RecordUninstallHooks(RecordClientsAndProtocolPtr pRCAP, XID oneclient)
{
int i = 0;
XID client;
@ -1165,9 +1145,7 @@ RecordUninstallHooks(pRCAP, oneclient)
* have at least one client.)
*/
static void
RecordDeleteClientFromRCAP(pRCAP, position)
RecordClientsAndProtocolPtr pRCAP;
int position;
RecordDeleteClientFromRCAP(RecordClientsAndProtocolPtr pRCAP, int position)
{
if (pRCAP->pContext->pRecordingClient)
RecordUninstallHooks(pRCAP, pRCAP->pClientIDs[position]);
@ -1214,9 +1192,7 @@ RecordDeleteClientFromRCAP(pRCAP, position)
* is no more room to hold clients internal to the RCAP.
*/
static void
RecordAddClientToRCAP(pRCAP, clientspec)
RecordClientsAndProtocolPtr pRCAP;
XID clientspec;
RecordAddClientToRCAP(RecordClientsAndProtocolPtr pRCAP, XID clientspec)
{
if (pRCAP->numClients == pRCAP->sizeClients)
{
@ -1262,9 +1238,7 @@ RecordAddClientToRCAP(pRCAP, clientspec)
* RCAP. (A given clientspec can only be on one RCAP of a context.)
*/
static void
RecordDeleteClientFromContext(pContext, clientspec)
RecordContextPtr pContext;
XID clientspec;
RecordDeleteClientFromContext(RecordContextPtr pContext, XID clientspec)
{
RecordClientsAndProtocolPtr pRCAP;
int position;
@ -1287,10 +1261,7 @@ RecordDeleteClientFromContext(pContext, clientspec)
* Side Effects: none.
*/
static int
RecordSanityCheckClientSpecifiers(clientspecs, nspecs, errorspec)
XID *clientspecs;
int nspecs;
XID errorspec;
RecordSanityCheckClientSpecifiers(XID *clientspecs, int nspecs, XID errorspec)
{
int i;
int clientIndex;
@ -1349,10 +1320,7 @@ RecordSanityCheckClientSpecifiers(clientspecs, nspecs, errorspec)
* pClientspecs may be modified in place.
*/
static XID *
RecordCanonicalizeClientSpecifiers(pClientspecs, pNumClientspecs, excludespec)
XID *pClientspecs;
int *pNumClientspecs;
XID excludespec;
RecordCanonicalizeClientSpecifiers(XID *pClientspecs, int *pNumClientspecs, XID excludespec)
{
int i;
int numClients = *pNumClientspecs;
@ -1449,10 +1417,7 @@ RecordPadAlign(int size, int align)
* Side Effects: none.
*/
static int
RecordSanityCheckRegisterClients(pContext, client, stuff)
RecordContextPtr pContext;
ClientPtr client;
xRecordRegisterClientsReq *stuff;
RecordSanityCheckRegisterClients(RecordContextPtr pContext, ClientPtr client, xRecordRegisterClientsReq *stuff)
{
int err;
xRecordRange *pRange;
@ -1587,9 +1552,7 @@ enum {REQ, /* set info for requests */
* RecordSetIntervals, all zeroed, and psi->size is set to size.
*/
static int
RecordAllocIntervals(psi, nIntervals)
SetInfoPtr psi;
int nIntervals;
RecordAllocIntervals(SetInfoPtr psi, int nIntervals)
{
assert(!psi->intervals);
psi->intervals = (RecordSetInterval *)
@ -1711,10 +1674,7 @@ RecordConvertRangesToIntervals(
* to record the new clients and protocol.
*/
static int
RecordRegisterClients(pContext, client, stuff)
RecordContextPtr pContext;
ClientPtr client;
xRecordRegisterClientsReq *stuff;
RecordRegisterClients(RecordContextPtr pContext, ClientPtr client, xRecordRegisterClientsReq *stuff)
{
int err;
int i;
@ -1987,8 +1947,7 @@ bailout:
*/
static int
ProcRecordQueryVersion(client)
ClientPtr client;
ProcRecordQueryVersion(ClientPtr client)
{
/* REQUEST(xRecordQueryVersionReq); */
xRecordQueryVersionReply rep;
@ -2013,8 +1972,7 @@ ProcRecordQueryVersion(client)
static int
ProcRecordCreateContext(client)
ClientPtr client;
ProcRecordCreateContext(ClientPtr client)
{
REQUEST(xRecordCreateContextReq);
RecordContextPtr pContext;
@ -2068,8 +2026,7 @@ bailout:
static int
ProcRecordRegisterClients(client)
ClientPtr client;
ProcRecordRegisterClients(ClientPtr client)
{
RecordContextPtr pContext;
REQUEST(xRecordRegisterClientsReq);
@ -2082,8 +2039,7 @@ ProcRecordRegisterClients(client)
static int
ProcRecordUnregisterClients(client)
ClientPtr client;
ProcRecordUnregisterClients(ClientPtr client)
{
RecordContextPtr pContext;
int err;
@ -2147,9 +2103,7 @@ typedef struct {
* number of ranges. Newly allocated ranges are zeroed.
*/
static int
RecordAllocRanges(pri, nRanges)
GetContextRangeInfoPtr pri;
int nRanges;
RecordAllocRanges(GetContextRangeInfoPtr pri, int nRanges)
{
int newsize;
xRecordRange *pNewRange;
@ -2309,9 +2263,7 @@ RecordConvertMinorOpInfoToRanges(
* The 16 bit fields of each xRecordRange are byte swapped.
*/
static void
RecordSwapRanges(pRanges, nRanges)
xRecordRange *pRanges;
int nRanges;
RecordSwapRanges(xRecordRange *pRanges, int nRanges)
{
int i;
register char n;
@ -2326,8 +2278,7 @@ RecordSwapRanges(pRanges, nRanges)
static int
ProcRecordGetContext(client)
ClientPtr client;
ProcRecordGetContext(ClientPtr client)
{
RecordContextPtr pContext;
REQUEST(xRecordGetContextReq);
@ -2473,8 +2424,7 @@ bailout:
static int
ProcRecordEnableContext(client)
ClientPtr client;
ProcRecordEnableContext(ClientPtr client)
{
RecordContextPtr pContext;
REQUEST(xRecordEnableContextReq);
@ -2552,8 +2502,7 @@ ProcRecordEnableContext(client)
* is resumed.
*/
static void
RecordDisableContext(pContext)
RecordContextPtr pContext;
RecordDisableContext(RecordContextPtr pContext)
{
RecordClientsAndProtocolPtr pRCAP;
int i;
@ -2590,8 +2539,7 @@ RecordDisableContext(pContext)
static int
ProcRecordDisableContext(client)
ClientPtr client;
ProcRecordDisableContext(ClientPtr client)
{
RecordContextPtr pContext;
REQUEST(xRecordDisableContextReq);
@ -2616,9 +2564,7 @@ ProcRecordDisableContext(client)
* it from the ppAllContexts array.
*/
static int
RecordDeleteContext(value, id)
pointer value;
XID id;
RecordDeleteContext(pointer value, XID id)
{
int i;
RecordContextPtr pContext = (RecordContextPtr)value;
@ -2658,8 +2604,7 @@ RecordDeleteContext(value, id)
static int
ProcRecordFreeContext(client)
ClientPtr client;
ProcRecordFreeContext(ClientPtr client)
{
RecordContextPtr pContext;
REQUEST(xRecordFreeContextReq);
@ -2672,8 +2617,7 @@ ProcRecordFreeContext(client)
static int
ProcRecordDispatch(client)
ClientPtr client;
ProcRecordDispatch(ClientPtr client)
{
REQUEST(xReq);
@ -2702,8 +2646,7 @@ ProcRecordDispatch(client)
static int
SProcRecordQueryVersion(client)
ClientPtr client;
SProcRecordQueryVersion(ClientPtr client)
{
REQUEST(xRecordQueryVersionReq);
register char n;
@ -2736,8 +2679,7 @@ SwapCreateRegister(xRecordRegisterClientsReq *stuff)
static int
SProcRecordCreateContext(client)
ClientPtr client;
SProcRecordCreateContext(ClientPtr client)
{
REQUEST(xRecordCreateContextReq);
register char n;
@ -2750,8 +2692,7 @@ SProcRecordCreateContext(client)
static int
SProcRecordRegisterClients(client)
ClientPtr client;
SProcRecordRegisterClients(ClientPtr client)
{
REQUEST(xRecordRegisterClientsReq);
register char n;
@ -2764,8 +2705,7 @@ SProcRecordRegisterClients(client)
static int
SProcRecordUnregisterClients(client)
ClientPtr client;
SProcRecordUnregisterClients(ClientPtr client)
{
REQUEST(xRecordUnregisterClientsReq);
register char n;
@ -2780,8 +2720,7 @@ SProcRecordUnregisterClients(client)
static int
SProcRecordGetContext(client)
ClientPtr client;
SProcRecordGetContext(ClientPtr client)
{
REQUEST(xRecordGetContextReq);
register char n;
@ -2793,8 +2732,7 @@ SProcRecordGetContext(client)
} /* SProcRecordGetContext */
static int
SProcRecordEnableContext(client)
ClientPtr client;
SProcRecordEnableContext(ClientPtr client)
{
REQUEST(xRecordEnableContextReq);
register char n;
@ -2807,8 +2745,7 @@ SProcRecordEnableContext(client)
static int
SProcRecordDisableContext(client)
ClientPtr client;
SProcRecordDisableContext(ClientPtr client)
{
REQUEST(xRecordDisableContextReq);
register char n;
@ -2821,8 +2758,7 @@ SProcRecordDisableContext(client)
static int
SProcRecordFreeContext(client)
ClientPtr client;
SProcRecordFreeContext(ClientPtr client)
{
REQUEST(xRecordFreeContextReq);
register char n;
@ -2835,8 +2771,7 @@ SProcRecordFreeContext(client)
static int
SProcRecordDispatch(client)
ClientPtr client;
SProcRecordDispatch(ClientPtr client)
{
REQUEST(xReq);
@ -2863,9 +2798,6 @@ SProcRecordDispatch(client)
}
} /* SProcRecordDispatch */
/* XXX goes in header file */
extern void SwapConnSetupInfo(), SwapConnSetupPrefix();
/* RecordConnectionSetupInfo
*
* Arguments:
@ -2879,16 +2811,14 @@ extern void SwapConnSetupInfo(), SwapConnSetupPrefix();
* The connection setup info is sent to the recording client.
*/
static void
RecordConnectionSetupInfo(pContext, pci)
RecordContextPtr pContext;
NewClientInfoRec *pci;
RecordConnectionSetupInfo(RecordContextPtr pContext, NewClientInfoRec *pci)
{
int prefixsize = SIZEOF(xConnSetupPrefix);
int restsize = pci->prefix->length * 4;
if (pci->client->swapped)
{
char * pConnSetup = (char *)ALLOCATE_LOCAL(prefixsize + restsize);
char *pConnSetup = (char *)ALLOCATE_LOCAL(prefixsize + restsize);
if (!pConnSetup)
return;
SwapConnSetupPrefix(pci->prefix, pConnSetup);
@ -2934,10 +2864,7 @@ RecordConnectionSetupInfo(pContext, pci)
*/
static void
RecordAClientStateChange(pcbl, nulldata, calldata)
CallbackListPtr *pcbl;
pointer nulldata;
pointer calldata;
RecordAClientStateChange(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
{
NewClientInfoRec *pci = (NewClientInfoRec *)calldata;
int i;
@ -3000,8 +2927,7 @@ RecordAClientStateChange(pcbl, nulldata, calldata)
*
*/
static void
RecordCloseDown(extEntry)
ExtensionEntry *extEntry;
RecordCloseDown(ExtensionEntry *extEntry)
{
DeleteCallback(&ClientStateCallback, RecordAClientStateChange, NULL);
} /* RecordCloseDown */
@ -3017,7 +2943,7 @@ RecordCloseDown(extEntry)
* Enables the RECORD extension if possible.
*/
void
RecordExtensionInit()
RecordExtensionInit(void)
{
ExtensionEntry *extentry;

1
render/mipict.c
View File

@ -129,7 +129,6 @@ miValidatePicture (PicturePtr pPicture,
Mask mask)
{
DrawablePtr pDrawable = pPicture->pDrawable;
ScreenPtr pScreen = pDrawable->pScreen;
if ((mask & (CPClipXOrigin|CPClipYOrigin|CPClipMask|CPSubwindowMode)) ||
(pDrawable->serialNumber != (pPicture->serialNumber & DRAWABLE_SERIAL_BITS)))