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: * mi/miscrinit.c:
Remove long-dead screen region code. 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> 2006-03-25 Daniel Stone <daniel@freedesktop.org>
* xkb/xkbUtils.c: * xkb/xkbUtils.c:

1
Xext/panoramiX.c
View File

@ -1176,7 +1176,6 @@ XineramaGetImageData(
BoxRec SrcBox, *pbox; BoxRec SrcBox, *pbox;
int x, y, w, h, i, j, nbox, size, sizeNeeded, ScratchPitch, inOut, depth; int x, y, w, h, i, j, nbox, size, sizeNeeded, ScratchPitch, inOut, depth;
DrawablePtr pDraw = pDrawables[0]; DrawablePtr pDraw = pDrawables[0];
ScreenPtr pScreen = pDraw->pScreen;
char *ScratchMem = NULL; char *ScratchMem = NULL;
size = 0; 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 $ */ /* $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; unsigned int format;
char * pBuf; char * pBuf;
{ {
ScreenPtr pScreen = pDraw->pScreen;
RegionRec imageRegion; /* region representing x,y,w,h */ RegionRec imageRegion; /* region representing x,y,w,h */
RegionRec censorRegion; /* region to obliterate */ RegionRec censorRegion; /* region to obliterate */
BoxRec imageBox; 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. 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_REPLIES
#define NEED_EVENTS #define NEED_EVENTS
@ -62,8 +62,8 @@ of the copyright holder.
extern Bool noXkbExtension; extern Bool noXkbExtension;
extern int xeviegrabState; extern int xeviegrabState;
static int ProcDispatch (), SProcDispatch (); static int ProcDispatch (register ClientPtr client), SProcDispatch (register ClientPtr client);
static void ResetProc (); static void ResetProc (ExtensionEntry *extEntry);
static unsigned char ReqCode = 0; static unsigned char ReqCode = 0;
static int ErrorBase; static int ErrorBase;
@ -129,7 +129,7 @@ static void XeviePointerProcessInputProc(xEvent *xE, DeviceIntPtr dev,
static void XevieKbdProcessInputProc(xEvent *xE, DeviceIntPtr dev, int count); static void XevieKbdProcessInputProc(xEvent *xE, DeviceIntPtr dev, int count);
void void
XevieExtensionInit () XevieExtensionInit (void)
{ {
ExtensionEntry* extEntry; ExtensionEntry* extEntry;
@ -158,18 +158,15 @@ XevieExtensionInit ()
/*ARGSUSED*/ /*ARGSUSED*/
static static
void ResetProc (extEntry) void ResetProc (ExtensionEntry *extEntry)
ExtensionEntry* extEntry;
{ {
} }
static static
int ProcQueryVersion (client) int ProcQueryVersion (register ClientPtr client)
register ClientPtr client;
{ {
REQUEST (xXevieQueryVersionReq); REQUEST (xXevieQueryVersionReq);
xXevieQueryVersionReply rep; xXevieQueryVersionReply rep;
register int n;
REQUEST_SIZE_MATCH (xXevieQueryVersionReq); REQUEST_SIZE_MATCH (xXevieQueryVersionReq);
rep.type = X_Reply; rep.type = X_Reply;
@ -182,12 +179,10 @@ int ProcQueryVersion (client)
} }
static static
int ProcStart (client) int ProcStart (register ClientPtr client)
register ClientPtr client;
{ {
REQUEST (xXevieStartReq); REQUEST (xXevieStartReq);
xXevieStartReply rep; xXevieStartReply rep;
register int n;
REQUEST_SIZE_MATCH (xXevieStartReq); REQUEST_SIZE_MATCH (xXevieStartReq);
rep.pad1 = 0; rep.pad1 = 0;
@ -224,8 +219,7 @@ int ProcStart (client)
} }
static static
int ProcEnd (client) int ProcEnd (register ClientPtr client)
register ClientPtr client;
{ {
xXevieEndReply rep; xXevieEndReply rep;
@ -244,13 +238,11 @@ int ProcEnd (client)
} }
static static
int ProcSend (client) int ProcSend (register ClientPtr client)
register ClientPtr client;
{ {
REQUEST (xXevieSendReq); REQUEST (xXevieSendReq);
xXevieSendReply rep; xXevieSendReply rep;
xEvent *xE; xEvent *xE;
OsCommPtr oc;
static unsigned char lastDetail = 0, lastType = 0; static unsigned char lastDetail = 0, lastType = 0;
if (client->index != xevieClientIndex) if (client->index != xevieClientIndex)
@ -288,8 +280,7 @@ int ProcSend (client)
} }
static static
int ProcSelectInput (client) int ProcSelectInput (register ClientPtr client)
register ClientPtr client;
{ {
REQUEST (xXevieSelectInputReq); REQUEST (xXevieSelectInputReq);
xXevieSelectInputReply rep; xXevieSelectInputReply rep;
@ -305,8 +296,7 @@ int ProcSelectInput (client)
} }
static static
int ProcDispatch (client) int ProcDispatch (register ClientPtr client)
register ClientPtr client;
{ {
REQUEST (xReq); REQUEST (xReq);
switch (stuff->data) switch (stuff->data)
@ -327,8 +317,7 @@ int ProcDispatch (client)
} }
static static
int SProcQueryVersion (client) int SProcQueryVersion (register ClientPtr client)
register ClientPtr client;
{ {
register int n; register int n;
@ -338,8 +327,7 @@ int SProcQueryVersion (client)
} }
static static
int SProcStart (client) int SProcStart (ClientPtr client)
ClientPtr client;
{ {
register int n; register int n;
@ -351,12 +339,9 @@ int SProcStart (client)
} }
static static
int SProcEnd (client) int SProcEnd (ClientPtr client)
ClientPtr client;
{ {
register int n; register int n;
int count;
xColorItem* pItem;
REQUEST (xXevieEndReq); REQUEST (xXevieEndReq);
swaps (&stuff->length, n); swaps (&stuff->length, n);
@ -366,11 +351,9 @@ int SProcEnd (client)
} }
static static
int SProcSend (client) int SProcSend (ClientPtr client)
ClientPtr client;
{ {
register int n; register int n;
int count;
REQUEST (xXevieSendReq); REQUEST (xXevieSendReq);
swaps (&stuff->length, n); swaps (&stuff->length, n);
@ -380,11 +363,9 @@ int SProcSend (client)
} }
static static
int SProcSelectInput (client) int SProcSelectInput (ClientPtr client)
ClientPtr client;
{ {
register int n; register int n;
int count;
REQUEST (xXevieSelectInputReq); REQUEST (xXevieSelectInputReq);
swaps (&stuff->length, n); swaps (&stuff->length, n);
@ -395,8 +376,7 @@ int SProcSelectInput (client)
static static
int SProcDispatch (client) int SProcDispatch (register ClientPtr client)
register ClientPtr client;
{ {
REQUEST(xReq); REQUEST(xReq);
switch (stuff->data) switch (stuff->data)

2
Xprint/AttrValid.h
View File

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

2
Xprint/Oid.h
View File

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

41
dbe/midbe.c
View File

@ -57,6 +57,7 @@
#include "regionstr.h" #include "regionstr.h"
#include "gcstruct.h" #include "gcstruct.h"
#include "inputstr.h" #include "inputstr.h"
#include "midbe.h"
#include <stdio.h> #include <stdio.h>
@ -94,9 +95,7 @@ int dbeWindowPrivIndex = -1;
*****************************************************************************/ *****************************************************************************/
static Bool static Bool
miDbeGetVisualInfo(pScreen, pScrVisInfo) miDbeGetVisualInfo(ScreenPtr pScreen, XdbeScreenVisualInfo *pScrVisInfo)
ScreenPtr pScreen;
XdbeScreenVisualInfo *pScrVisInfo;
{ {
register int i, j, k; register int i, j, k;
register int count; register int count;
@ -158,10 +157,7 @@ miDbeGetVisualInfo(pScreen, pScrVisInfo)
*****************************************************************************/ *****************************************************************************/
static int static int
miDbeAllocBackBufferName(pWin, bufId, swapAction) miDbeAllocBackBufferName(WindowPtr pWin, XID bufId, int swapAction)
WindowPtr pWin;
XID bufId;
int swapAction;
{ {
ScreenPtr pScreen; ScreenPtr pScreen;
DbeWindowPrivPtr pDbeWindowPriv; DbeWindowPrivPtr pDbeWindowPriv;
@ -272,8 +268,7 @@ miDbeAllocBackBufferName(pWin, bufId, swapAction)
*****************************************************************************/ *****************************************************************************/
static void static void
miDbeAliasBuffers(pDbeWindowPriv) miDbeAliasBuffers(DbeWindowPrivPtr pDbeWindowPriv)
DbeWindowPrivPtr pDbeWindowPriv;
{ {
int i; int i;
MiDbeWindowPrivPrivPtr pDbeWindowPrivPriv = MiDbeWindowPrivPrivPtr pDbeWindowPrivPriv =
@ -299,10 +294,7 @@ miDbeAliasBuffers(pDbeWindowPriv)
*****************************************************************************/ *****************************************************************************/
static int static int
miDbeSwapBuffers(client, pNumWindows, swapInfo) miDbeSwapBuffers(ClientPtr client, int *pNumWindows, DbeSwapInfoPtr swapInfo)
ClientPtr client;
int *pNumWindows;
DbeSwapInfoPtr swapInfo;
{ {
DbeScreenPrivPtr pDbeScreenPriv; DbeScreenPrivPtr pDbeScreenPriv;
GCPtr pGC; GCPtr pGC;
@ -481,9 +473,7 @@ miDbeSwapBuffers(client, pNumWindows, swapInfo)
*****************************************************************************/ *****************************************************************************/
static void static void
miDbeWinPrivDelete(pDbeWindowPriv, bufId) miDbeWinPrivDelete(DbeWindowPrivPtr pDbeWindowPriv, XID bufId)
DbeWindowPrivPtr pDbeWindowPriv;
XID bufId;
{ {
MiDbeWindowPrivPrivPtr pDbeWindowPrivPriv; MiDbeWindowPrivPrivPtr pDbeWindowPrivPriv;
@ -530,10 +520,7 @@ miDbeWinPrivDelete(pDbeWindowPriv, bufId)
*****************************************************************************/ *****************************************************************************/
static Bool static Bool
miDbePositionWindow(pWin, x, y) miDbePositionWindow(WindowPtr pWin, int x, int y)
WindowPtr pWin;
int x;
int y;
{ {
ScreenPtr pScreen; ScreenPtr pScreen;
DbeScreenPrivPtr pDbeScreenPriv; DbeScreenPrivPtr pDbeScreenPriv;
@ -771,8 +758,7 @@ miDbePositionWindow(pWin, x, y)
*****************************************************************************/ *****************************************************************************/
static void static void
miDbeResetProc(pScreen) miDbeResetProc(ScreenPtr pScreen)
ScreenPtr pScreen;
{ {
DbeScreenPrivPtr pDbeScreenPriv; DbeScreenPrivPtr pDbeScreenPriv;
@ -784,6 +770,11 @@ miDbeResetProc(pScreen)
} /* miDbeResetProc() */ } /* miDbeResetProc() */
static void
miDbeNopValidateBuffer(WindowPtr pWin, XID bufId, Bool dstbuffer)
{
}
/****************************************************************************** /******************************************************************************
* *
@ -796,9 +787,7 @@ miDbeResetProc(pScreen)
*****************************************************************************/ *****************************************************************************/
Bool Bool
miDbeInit(pScreen, pDbeScreenPriv) miDbeInit(ScreenPtr pScreen, DbeScreenPrivPtr pDbeScreenPriv)
ScreenPtr pScreen;
DbeScreenPrivPtr pDbeScreenPriv;
{ {
/* Copy resource types created by DIX */ /* Copy resource types created by DIX */
dbeDrawableResType = pDbeScreenPriv->dbeDrawableResType; dbeDrawableResType = pDbeScreenPriv->dbeDrawableResType;
@ -844,7 +833,7 @@ miDbeInit(pScreen, pDbeScreenPriv)
pDbeScreenPriv->WinPrivDelete = miDbeWinPrivDelete; pDbeScreenPriv->WinPrivDelete = miDbeWinPrivDelete;
/* The mi implementation doesn't need buffer validation. */ /* The mi implementation doesn't need buffer validation. */
pDbeScreenPriv->ValidateBuffer = (void (*)())NoopDDA; pDbeScreenPriv->ValidateBuffer = miDbeNopValidateBuffer;
return(TRUE); 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 $ */ /* $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 #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h> #include <dix-config.h>
@ -126,7 +126,8 @@ _AddInputDevice(DeviceProc deviceProc, Bool autoStart)
dev->xkb_interest= NULL; dev->xkb_interest= NULL;
#endif #endif
dev->nPrivates = 0; dev->nPrivates = 0;
dev->devPrivates = dev->unwrapProc = NULL; dev->devPrivates = NULL;
dev->unwrapProc = NULL;
inputInfo.off_devices = dev; inputInfo.off_devices = dev;
return 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 $ */ /* $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. */ * compute correctly. */
void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff) void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff)
{ {
ScreenPtr pScreen = win->drawable.pScreen;
GrabPtr grab; GrabPtr grab;
if (noPanoramiXExtension) return; 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 $ */ /* $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 x, register int y,
register int w, register int h) register int w, register int h)
{ {
ScreenPtr pScreen = pWin->drawable.pScreen;
BoxRec box; BoxRec box;
box = *(REGION_EXTENTS(pScreen, &pWin->winSize)); box = *(REGION_EXTENTS(pScreen, &pWin->winSize));
@ -1611,8 +1610,6 @@ CreateUnclippedWinSize (register WindowPtr pWin)
pRgn = REGION_CREATE(pWin->drawable.pScreen, &box, 1); pRgn = REGION_CREATE(pWin->drawable.pScreen, &box, 1);
#ifdef SHAPE #ifdef SHAPE
if (wBoundingShape (pWin) || wClipShape (pWin)) { if (wBoundingShape (pWin) || wClipShape (pWin)) {
ScreenPtr pScreen = pWin->drawable.pScreen;
REGION_TRANSLATE(pScreen, pRgn, - pWin->drawable.x, REGION_TRANSLATE(pScreen, pRgn, - pWin->drawable.x,
- pWin->drawable.y); - pWin->drawable.y);
if (wBoundingShape (pWin)) if (wBoundingShape (pWin))
@ -1647,8 +1644,6 @@ SetWinSize (register WindowPtr pWin)
(int)pWin->drawable.height); (int)pWin->drawable.height);
#ifdef SHAPE #ifdef SHAPE
if (wBoundingShape (pWin) || wClipShape (pWin)) { if (wBoundingShape (pWin) || wClipShape (pWin)) {
ScreenPtr pScreen = pWin->drawable.pScreen;
REGION_TRANSLATE(pScreen, &pWin->winSize, - pWin->drawable.x, REGION_TRANSLATE(pScreen, &pWin->winSize, - pWin->drawable.x,
- pWin->drawable.y); - pWin->drawable.y);
if (wBoundingShape (pWin)) if (wBoundingShape (pWin))
@ -1689,8 +1684,6 @@ SetBorderSize (register WindowPtr pWin)
(int)(pWin->drawable.height + (bw<<1))); (int)(pWin->drawable.height + (bw<<1)));
#ifdef SHAPE #ifdef SHAPE
if (wBoundingShape (pWin)) { if (wBoundingShape (pWin)) {
ScreenPtr pScreen = pWin->drawable.pScreen;
REGION_TRANSLATE(pScreen, &pWin->borderSize, - pWin->drawable.x, REGION_TRANSLATE(pScreen, &pWin->borderSize, - pWin->drawable.x,
- pWin->drawable.y); - pWin->drawable.y);
REGION_INTERSECT(pScreen, &pWin->borderSize, &pWin->borderSize, REGION_INTERSECT(pScreen, &pWin->borderSize, &pWin->borderSize,
@ -1900,7 +1893,6 @@ MakeBoundingRegion (
BoxPtr pBox) BoxPtr pBox)
{ {
RegionPtr pRgn; RegionPtr pRgn;
ScreenPtr pScreen = pWin->drawable.pScreen;
pRgn = REGION_CREATE(pScreen, pBox, 1); pRgn = REGION_CREATE(pScreen, pBox, 1);
if (wBoundingShape (pWin)) { 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 $ */ /* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.14 2003/10/29 22:57:48 tsi Exp $ */
/*********************************************************** /***********************************************************
@ -112,12 +112,12 @@ ICEILTEMPDECL
#endif #endif
#ifdef USE_INLINE #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; 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; return x<y? x:y;
} }

1
mi/mioverlay.c
View File

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

8
miext/shadow/shadow.h
View File

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

2
os/connection.c
View File

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

8
os/xdmauth.c
View File

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

1
render/mipict.c
View File

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