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

Replace 'pointer' type with 'void *' 

This lets us stop using the 'pointer' typedef in Xdefs.h as 'pointer'
is used throughout the X server for other things, and having duplicate
names generates compiler warnings.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Keith Packard 2013-12-15 01:05:51 -08:00
parent 93fa64e17d
commit 60014a4a98
319 changed files with 1916 additions and 1913 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Xext/geext.c
View File

@ -150,7 +150,7 @@ SProcGEDispatch(ClientPtr client)
* used in the furture for versioning support. * used in the furture for versioning support.
*/ */
static void static void
GEClientCallback(CallbackListPtr *list, pointer closure, pointer data) GEClientCallback(CallbackListPtr *list, void *closure, void *data)
{ {
NewClientInfoRec *clientinfo = (NewClientInfoRec *) data; NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
ClientPtr pClient = clientinfo->client; ClientPtr pClient = clientinfo->client;

8
Xext/hashtable.c
View File

@ -23,7 +23,7 @@ struct HashTableRec {
HashFunc hash; HashFunc hash;
HashCompareFunc compare; HashCompareFunc compare;
pointer cdata; void *cdata;
}; };
typedef struct { typedef struct {
@ -37,7 +37,7 @@ ht_create(int keySize,
int dataSize, int dataSize,
HashFunc hash, HashFunc hash,
HashCompareFunc compare, HashCompareFunc compare,
pointer cdata) void *cdata)
{ {
int c; int c;
int numBuckets; int numBuckets;
@ -117,7 +117,7 @@ double_size(HashTable ht)
} }
} }
pointer void *
ht_add(HashTable ht, const void *key) ht_add(HashTable ht, const void *key)
{ {
unsigned index = ht->hash(ht->cdata, key, ht->bucketBits); unsigned index = ht->hash(ht->cdata, key, ht->bucketBits);
@ -182,7 +182,7 @@ ht_remove(HashTable ht, const void *key)
} }
} }
pointer void *
ht_find(HashTable ht, const void *key) ht_find(HashTable ht, const void *key)
{ {
unsigned index = ht->hash(ht->cdata, key, ht->bucketBits); unsigned index = ht->hash(ht->cdata, key, ht->bucketBits);

6
Xext/hashtable.h
View File

@ -55,7 +55,7 @@ extern _X_EXPORT HashTable ht_create(int keySize,
int dataSize, int dataSize,
HashFunc hash, HashFunc hash,
HashCompareFunc compare, HashCompareFunc compare,
pointer cdata); void *cdata);
/** @brief HtDestruct deinitializes the structure. It does not free the /** @brief HtDestruct deinitializes the structure. It does not free the
memory allocated to HashTableRec memory allocated to HashTableRec
*/ */
@ -75,7 +75,7 @@ extern _X_EXPORT void ht_destroy(HashTable ht);
to avoid returning NULL. Obviously the data pointed cannot be to avoid returning NULL. Obviously the data pointed cannot be
modified, as implied by dataSize being 0. modified, as implied by dataSize being 0.
*/ */
extern _X_EXPORT pointer ht_add(HashTable ht, const void *key); extern _X_EXPORT void *ht_add(HashTable ht, const void *key);
/** @brief Removes a key from the hash table along with its /** @brief Removes a key from the hash table along with its
associated data, which will be free'd. associated data, which will be free'd.
@ -93,7 +93,7 @@ extern _X_EXPORT void ht_remove(HashTable ht, const void *key);
use HtMember instead to determine if a key has been use HtMember instead to determine if a key has been
inserted. inserted.
*/ */
extern _X_EXPORT pointer ht_find(HashTable ht, const void *key); extern _X_EXPORT void *ht_find(HashTable ht, const void *key);
/** @brief A generic hash function */ /** @brief A generic hash function */
extern _X_EXPORT unsigned ht_generic_hash(void *cdata, extern _X_EXPORT unsigned ht_generic_hash(void *cdata,

16
Xext/panoramiX.c
View File

@ -130,7 +130,7 @@ static void XineramaValidateGC(GCPtr, unsigned long, DrawablePtr);
static void XineramaChangeGC(GCPtr, unsigned long); static void XineramaChangeGC(GCPtr, unsigned long);
static void XineramaCopyGC(GCPtr, unsigned long, GCPtr); static void XineramaCopyGC(GCPtr, unsigned long, GCPtr);
static void XineramaDestroyGC(GCPtr); static void XineramaDestroyGC(GCPtr);
static void XineramaChangeClip(GCPtr, int, pointer, int); static void XineramaChangeClip(GCPtr, int, void *, int);
static void XineramaDestroyClip(GCPtr); static void XineramaDestroyClip(GCPtr);
static void XineramaCopyClip(GCPtr, GCPtr); static void XineramaCopyClip(GCPtr, GCPtr);
@ -160,7 +160,7 @@ XineramaCloseScreen(ScreenPtr pScreen)
if (pScreen->myNum == 0) if (pScreen->myNum == 0)
RegionUninit(&PanoramiXScreenRegion); RegionUninit(&PanoramiXScreenRegion);
free((pointer) pScreenPriv); free(pScreenPriv);
return (*pScreen->CloseScreen) (pScreen); return (*pScreen->CloseScreen) (pScreen);
} }
@ -294,7 +294,7 @@ XineramaCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst)
} }
static void static void
XineramaChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects) XineramaChangeClip(GCPtr pGC, int type, void *pvalue, int nrects)
{ {
Xinerama_GC_FUNC_PROLOGUE(pGC); Xinerama_GC_FUNC_PROLOGUE(pGC);
(*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects); (*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects);
@ -318,7 +318,7 @@ XineramaDestroyClip(GCPtr pGC)
} }
int int
XineramaDeleteResource(pointer data, XID id) XineramaDeleteResource(void *data, XID id)
{ {
free(data); free(data);
return 1; return 1;
@ -330,7 +330,7 @@ typedef struct {
} PanoramiXSearchData; } PanoramiXSearchData;
static Bool static Bool
XineramaFindIDByScrnum(pointer resource, XID id, pointer privdata) XineramaFindIDByScrnum(void *resource, XID id, void *privdata)
{ {
PanoramiXRes *res = (PanoramiXRes *) resource; PanoramiXRes *res = (PanoramiXRes *) resource;
PanoramiXSearchData *data = (PanoramiXSearchData *) privdata; PanoramiXSearchData *data = (PanoramiXSearchData *) privdata;
@ -342,7 +342,7 @@ PanoramiXRes *
PanoramiXFindIDByScrnum(RESTYPE type, XID id, int screen) PanoramiXFindIDByScrnum(RESTYPE type, XID id, int screen)
{ {
PanoramiXSearchData data; PanoramiXSearchData data;
pointer val; void *val;
if (!screen) { if (!screen) {
dixLookupResourceByType(&val, id, type, serverClient, DixReadAccess); dixLookupResourceByType(&val, id, type, serverClient, DixReadAccess);
@ -691,9 +691,9 @@ PanoramiXCreateConnectionBlock(void)
root->mmHeight *= height_mult; root->mmHeight *= height_mult;
while (ConnectionCallbackList) { while (ConnectionCallbackList) {
pointer tmp; void *tmp;
tmp = (pointer) ConnectionCallbackList; tmp = (void *) ConnectionCallbackList;
(*ConnectionCallbackList->func) (); (*ConnectionCallbackList->func) ();
ConnectionCallbackList = ConnectionCallbackList->next; ConnectionCallbackList = ConnectionCallbackList->next;
free(tmp); free(tmp);

164
Xext/panoramiXprocs.c
View File

@ -72,7 +72,7 @@ PanoramiXCreateWindow(ClientPtr client)
if (Ones(stuff->mask) != len) if (Ones(stuff->mask) != len)
return BadLength; return BadLength;
result = dixLookupResourceByType((pointer *) &parent, stuff->parent, result = dixLookupResourceByType((void **) &parent, stuff->parent,
XRT_WINDOW, client, DixWriteAccess); XRT_WINDOW, client, DixWriteAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -87,7 +87,7 @@ PanoramiXCreateWindow(ClientPtr client)
pback_offset = Ones((Mask) stuff->mask & (CWBackPixmap - 1)); pback_offset = Ones((Mask) stuff->mask & (CWBackPixmap - 1));
tmp = *((CARD32 *) &stuff[1] + pback_offset); tmp = *((CARD32 *) &stuff[1] + pback_offset);
if ((tmp != None) && (tmp != ParentRelative)) { if ((tmp != None) && (tmp != ParentRelative)) {
result = dixLookupResourceByType((pointer *) &backPix, tmp, result = dixLookupResourceByType((void **) &backPix, tmp,
XRT_PIXMAP, client, DixReadAccess); XRT_PIXMAP, client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -97,7 +97,7 @@ PanoramiXCreateWindow(ClientPtr client)
pbord_offset = Ones((Mask) stuff->mask & (CWBorderPixmap - 1)); pbord_offset = Ones((Mask) stuff->mask & (CWBorderPixmap - 1));
tmp = *((CARD32 *) &stuff[1] + pbord_offset); tmp = *((CARD32 *) &stuff[1] + pbord_offset);
if (tmp != CopyFromParent) { if (tmp != CopyFromParent) {
result = dixLookupResourceByType((pointer *) &bordPix, tmp, result = dixLookupResourceByType((void **) &bordPix, tmp,
XRT_PIXMAP, client, DixReadAccess); XRT_PIXMAP, client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -107,7 +107,7 @@ PanoramiXCreateWindow(ClientPtr client)
cmap_offset = Ones((Mask) stuff->mask & (CWColormap - 1)); cmap_offset = Ones((Mask) stuff->mask & (CWColormap - 1));
tmp = *((CARD32 *) &stuff[1] + cmap_offset); tmp = *((CARD32 *) &stuff[1] + cmap_offset);
if ((tmp != CopyFromParent) && (tmp != None)) { if ((tmp != CopyFromParent) && (tmp != None)) {
result = dixLookupResourceByType((pointer *) &cmap, tmp, result = dixLookupResourceByType((void **) &cmap, tmp,
XRT_COLORMAP, client, XRT_COLORMAP, client,
DixReadAccess); DixReadAccess);
if (result != Success) if (result != Success)
@ -178,7 +178,7 @@ PanoramiXChangeWindowAttributes(ClientPtr client)
if (Ones(stuff->valueMask) != len) if (Ones(stuff->valueMask) != len)
return BadLength; return BadLength;
result = dixLookupResourceByType((pointer *) &win, stuff->window, result = dixLookupResourceByType((void **) &win, stuff->window,
XRT_WINDOW, client, DixWriteAccess); XRT_WINDOW, client, DixWriteAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -191,7 +191,7 @@ PanoramiXChangeWindowAttributes(ClientPtr client)
pback_offset = Ones((Mask) stuff->valueMask & (CWBackPixmap - 1)); pback_offset = Ones((Mask) stuff->valueMask & (CWBackPixmap - 1));
tmp = *((CARD32 *) &stuff[1] + pback_offset); tmp = *((CARD32 *) &stuff[1] + pback_offset);
if ((tmp != None) && (tmp != ParentRelative)) { if ((tmp != None) && (tmp != ParentRelative)) {
result = dixLookupResourceByType((pointer *) &backPix, tmp, result = dixLookupResourceByType((void **) &backPix, tmp,
XRT_PIXMAP, client, DixReadAccess); XRT_PIXMAP, client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -201,7 +201,7 @@ PanoramiXChangeWindowAttributes(ClientPtr client)
pbord_offset = Ones((Mask) stuff->valueMask & (CWBorderPixmap - 1)); pbord_offset = Ones((Mask) stuff->valueMask & (CWBorderPixmap - 1));
tmp = *((CARD32 *) &stuff[1] + pbord_offset); tmp = *((CARD32 *) &stuff[1] + pbord_offset);
if (tmp != CopyFromParent) { if (tmp != CopyFromParent) {
result = dixLookupResourceByType((pointer *) &bordPix, tmp, result = dixLookupResourceByType((void **) &bordPix, tmp,
XRT_PIXMAP, client, DixReadAccess); XRT_PIXMAP, client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -211,7 +211,7 @@ PanoramiXChangeWindowAttributes(ClientPtr client)
cmap_offset = Ones((Mask) stuff->valueMask & (CWColormap - 1)); cmap_offset = Ones((Mask) stuff->valueMask & (CWColormap - 1));
tmp = *((CARD32 *) &stuff[1] + cmap_offset); tmp = *((CARD32 *) &stuff[1] + cmap_offset);
if ((tmp != CopyFromParent) && (tmp != None)) { if ((tmp != CopyFromParent) && (tmp != None)) {
result = dixLookupResourceByType((pointer *) &cmap, tmp, result = dixLookupResourceByType((void **) &cmap, tmp,
XRT_COLORMAP, client, XRT_COLORMAP, client,
DixReadAccess); DixReadAccess);
if (result != Success) if (result != Success)
@ -243,7 +243,7 @@ PanoramiXDestroyWindow(ClientPtr client)
REQUEST_SIZE_MATCH(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq);
result = dixLookupResourceByType((pointer *) &win, stuff->id, XRT_WINDOW, result = dixLookupResourceByType((void **) &win, stuff->id, XRT_WINDOW,
client, DixDestroyAccess); client, DixDestroyAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -271,7 +271,7 @@ PanoramiXDestroySubwindows(ClientPtr client)
REQUEST_SIZE_MATCH(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq);
result = dixLookupResourceByType((pointer *) &win, stuff->id, XRT_WINDOW, result = dixLookupResourceByType((void **) &win, stuff->id, XRT_WINDOW,
client, DixDestroyAccess); client, DixDestroyAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -299,7 +299,7 @@ PanoramiXChangeSaveSet(ClientPtr client)
REQUEST_SIZE_MATCH(xChangeSaveSetReq); REQUEST_SIZE_MATCH(xChangeSaveSetReq);
result = dixLookupResourceByType((pointer *) &win, stuff->window, result = dixLookupResourceByType((void **) &win, stuff->window,
XRT_WINDOW, client, DixReadAccess); XRT_WINDOW, client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -326,12 +326,12 @@ PanoramiXReparentWindow(ClientPtr client)
REQUEST_SIZE_MATCH(xReparentWindowReq); REQUEST_SIZE_MATCH(xReparentWindowReq);
result = dixLookupResourceByType((pointer *) &win, stuff->window, result = dixLookupResourceByType((void **) &win, stuff->window,
XRT_WINDOW, client, DixWriteAccess); XRT_WINDOW, client, DixWriteAccess);
if (result != Success) if (result != Success)
return result; return result;
result = dixLookupResourceByType((pointer *) &parent, stuff->parent, result = dixLookupResourceByType((void **) &parent, stuff->parent,
XRT_WINDOW, client, DixWriteAccess); XRT_WINDOW, client, DixWriteAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -365,7 +365,7 @@ PanoramiXMapWindow(ClientPtr client)
REQUEST_SIZE_MATCH(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq);
result = dixLookupResourceByType((pointer *) &win, stuff->id, result = dixLookupResourceByType((void **) &win, stuff->id,
XRT_WINDOW, client, DixReadAccess); XRT_WINDOW, client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -390,7 +390,7 @@ PanoramiXMapSubwindows(ClientPtr client)
REQUEST_SIZE_MATCH(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq);
result = dixLookupResourceByType((pointer *) &win, stuff->id, result = dixLookupResourceByType((void **) &win, stuff->id,
XRT_WINDOW, client, DixReadAccess); XRT_WINDOW, client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -415,7 +415,7 @@ PanoramiXUnmapWindow(ClientPtr client)
REQUEST_SIZE_MATCH(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq);
result = dixLookupResourceByType((pointer *) &win, stuff->id, result = dixLookupResourceByType((void **) &win, stuff->id,
XRT_WINDOW, client, DixReadAccess); XRT_WINDOW, client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -440,7 +440,7 @@ PanoramiXUnmapSubwindows(ClientPtr client)
REQUEST_SIZE_MATCH(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq);
result = dixLookupResourceByType((pointer *) &win, stuff->id, result = dixLookupResourceByType((void **) &win, stuff->id,
XRT_WINDOW, client, DixReadAccess); XRT_WINDOW, client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -474,12 +474,12 @@ PanoramiXConfigureWindow(ClientPtr client)
return BadLength; return BadLength;
/* because we need the parent */ /* because we need the parent */
result = dixLookupResourceByType((pointer *) &pWin, stuff->window, result = dixLookupResourceByType((void **) &pWin, stuff->window,
RT_WINDOW, client, DixWriteAccess); RT_WINDOW, client, DixWriteAccess);
if (result != Success) if (result != Success)
return result; return result;
result = dixLookupResourceByType((pointer *) &win, stuff->window, result = dixLookupResourceByType((void **) &win, stuff->window,
XRT_WINDOW, client, DixWriteAccess); XRT_WINDOW, client, DixWriteAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -489,7 +489,7 @@ PanoramiXConfigureWindow(ClientPtr client)
sib_offset = Ones((Mask) stuff->mask & (CWSibling - 1)); sib_offset = Ones((Mask) stuff->mask & (CWSibling - 1));
if ((tmp = *((CARD32 *) &stuff[1] + sib_offset))) { if ((tmp = *((CARD32 *) &stuff[1] + sib_offset))) {
result = dixLookupResourceByType((pointer *) &sib, tmp, XRT_WINDOW, result = dixLookupResourceByType((void **) &sib, tmp, XRT_WINDOW,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -537,7 +537,7 @@ PanoramiXCirculateWindow(ClientPtr client)
REQUEST_SIZE_MATCH(xCirculateWindowReq); REQUEST_SIZE_MATCH(xCirculateWindowReq);
result = dixLookupResourceByType((pointer *) &win, stuff->window, result = dixLookupResourceByType((void **) &win, stuff->window,
XRT_WINDOW, client, DixWriteAccess); XRT_WINDOW, client, DixWriteAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -687,7 +687,7 @@ PanoramiXCreatePixmap(ClientPtr client)
REQUEST_SIZE_MATCH(xCreatePixmapReq); REQUEST_SIZE_MATCH(xCreatePixmapReq);
client->errorValue = stuff->pid; client->errorValue = stuff->pid;
result = dixLookupResourceByClass((pointer *) &refDraw, stuff->drawable, result = dixLookupResourceByClass((void **) &refDraw, stuff->drawable,
XRC_DRAWABLE, client, DixReadAccess); XRC_DRAWABLE, client, DixReadAccess);
if (result != Success) if (result != Success)
return (result == BadValue) ? BadDrawable : result; return (result == BadValue) ? BadDrawable : result;
@ -727,7 +727,7 @@ PanoramiXFreePixmap(ClientPtr client)
client->errorValue = stuff->id; client->errorValue = stuff->id;
result = dixLookupResourceByType((pointer *) &pix, stuff->id, XRT_PIXMAP, result = dixLookupResourceByType((void **) &pix, stuff->id, XRT_PIXMAP,
client, DixDestroyAccess); client, DixDestroyAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -766,7 +766,7 @@ PanoramiXCreateGC(ClientPtr client)
if (Ones(stuff->mask) != len) if (Ones(stuff->mask) != len)
return BadLength; return BadLength;
result = dixLookupResourceByClass((pointer *) &refDraw, stuff->drawable, result = dixLookupResourceByClass((void **) &refDraw, stuff->drawable,
XRC_DRAWABLE, client, DixReadAccess); XRC_DRAWABLE, client, DixReadAccess);
if (result != Success) if (result != Success)
return (result == BadValue) ? BadDrawable : result; return (result == BadValue) ? BadDrawable : result;
@ -774,7 +774,7 @@ PanoramiXCreateGC(ClientPtr client)
if ((Mask) stuff->mask & GCTile) { if ((Mask) stuff->mask & GCTile) {
tile_offset = Ones((Mask) stuff->mask & (GCTile - 1)); tile_offset = Ones((Mask) stuff->mask & (GCTile - 1));
if ((tmp = *((CARD32 *) &stuff[1] + tile_offset))) { if ((tmp = *((CARD32 *) &stuff[1] + tile_offset))) {
result = dixLookupResourceByType((pointer *) &tile, tmp, XRT_PIXMAP, result = dixLookupResourceByType((void **) &tile, tmp, XRT_PIXMAP,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -783,7 +783,7 @@ PanoramiXCreateGC(ClientPtr client)
if ((Mask) stuff->mask & GCStipple) { if ((Mask) stuff->mask & GCStipple) {
stip_offset = Ones((Mask) stuff->mask & (GCStipple - 1)); stip_offset = Ones((Mask) stuff->mask & (GCStipple - 1));
if ((tmp = *((CARD32 *) &stuff[1] + stip_offset))) { if ((tmp = *((CARD32 *) &stuff[1] + stip_offset))) {
result = dixLookupResourceByType((pointer *) &stip, tmp, XRT_PIXMAP, result = dixLookupResourceByType((void **) &stip, tmp, XRT_PIXMAP,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -792,7 +792,7 @@ PanoramiXCreateGC(ClientPtr client)
if ((Mask) stuff->mask & GCClipMask) { if ((Mask) stuff->mask & GCClipMask) {
clip_offset = Ones((Mask) stuff->mask & (GCClipMask - 1)); clip_offset = Ones((Mask) stuff->mask & (GCClipMask - 1));
if ((tmp = *((CARD32 *) &stuff[1] + clip_offset))) { if ((tmp = *((CARD32 *) &stuff[1] + clip_offset))) {
result = dixLookupResourceByType((pointer *) &clip, tmp, XRT_PIXMAP, result = dixLookupResourceByType((void **) &clip, tmp, XRT_PIXMAP,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -846,7 +846,7 @@ PanoramiXChangeGC(ClientPtr client)
if (Ones(stuff->mask) != len) if (Ones(stuff->mask) != len)
return BadLength; return BadLength;
result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -854,7 +854,7 @@ PanoramiXChangeGC(ClientPtr client)
if ((Mask) stuff->mask & GCTile) { if ((Mask) stuff->mask & GCTile) {
tile_offset = Ones((Mask) stuff->mask & (GCTile - 1)); tile_offset = Ones((Mask) stuff->mask & (GCTile - 1));
if ((tmp = *((CARD32 *) &stuff[1] + tile_offset))) { if ((tmp = *((CARD32 *) &stuff[1] + tile_offset))) {
result = dixLookupResourceByType((pointer *) &tile, tmp, XRT_PIXMAP, result = dixLookupResourceByType((void **) &tile, tmp, XRT_PIXMAP,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -863,7 +863,7 @@ PanoramiXChangeGC(ClientPtr client)
if ((Mask) stuff->mask & GCStipple) { if ((Mask) stuff->mask & GCStipple) {
stip_offset = Ones((Mask) stuff->mask & (GCStipple - 1)); stip_offset = Ones((Mask) stuff->mask & (GCStipple - 1));
if ((tmp = *((CARD32 *) &stuff[1] + stip_offset))) { if ((tmp = *((CARD32 *) &stuff[1] + stip_offset))) {
result = dixLookupResourceByType((pointer *) &stip, tmp, XRT_PIXMAP, result = dixLookupResourceByType((void **) &stip, tmp, XRT_PIXMAP,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -872,7 +872,7 @@ PanoramiXChangeGC(ClientPtr client)
if ((Mask) stuff->mask & GCClipMask) { if ((Mask) stuff->mask & GCClipMask) {
clip_offset = Ones((Mask) stuff->mask & (GCClipMask - 1)); clip_offset = Ones((Mask) stuff->mask & (GCClipMask - 1));
if ((tmp = *((CARD32 *) &stuff[1] + clip_offset))) { if ((tmp = *((CARD32 *) &stuff[1] + clip_offset))) {
result = dixLookupResourceByType((pointer *) &clip, tmp, XRT_PIXMAP, result = dixLookupResourceByType((void **) &clip, tmp, XRT_PIXMAP,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -905,12 +905,12 @@ PanoramiXCopyGC(ClientPtr client)
REQUEST_SIZE_MATCH(xCopyGCReq); REQUEST_SIZE_MATCH(xCopyGCReq);
result = dixLookupResourceByType((pointer *) &srcGC, stuff->srcGC, XRT_GC, result = dixLookupResourceByType((void **) &srcGC, stuff->srcGC, XRT_GC,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
result = dixLookupResourceByType((pointer *) &dstGC, stuff->dstGC, XRT_GC, result = dixLookupResourceByType((void **) &dstGC, stuff->dstGC, XRT_GC,
client, DixWriteAccess); client, DixWriteAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -936,7 +936,7 @@ PanoramiXSetDashes(ClientPtr client)
REQUEST_FIXED_SIZE(xSetDashesReq, stuff->nDashes); REQUEST_FIXED_SIZE(xSetDashesReq, stuff->nDashes);
result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixWriteAccess); client, DixWriteAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -961,7 +961,7 @@ PanoramiXSetClipRectangles(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xSetClipRectanglesReq); REQUEST_AT_LEAST_SIZE(xSetClipRectanglesReq);
result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixWriteAccess); client, DixWriteAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -986,7 +986,7 @@ PanoramiXFreeGC(ClientPtr client)
REQUEST_SIZE_MATCH(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq);
result = dixLookupResourceByType((pointer *) &gc, stuff->id, XRT_GC, result = dixLookupResourceByType((void **) &gc, stuff->id, XRT_GC,
client, DixDestroyAccess); client, DixDestroyAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -1015,7 +1015,7 @@ PanoramiXClearToBackground(ClientPtr client)
REQUEST_SIZE_MATCH(xClearAreaReq); REQUEST_SIZE_MATCH(xClearAreaReq);
result = dixLookupResourceByType((pointer *) &win, stuff->window, result = dixLookupResourceByType((void **) &win, stuff->window,
XRT_WINDOW, client, DixWriteAccess); XRT_WINDOW, client, DixWriteAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -1060,14 +1060,14 @@ PanoramiXCopyArea(ClientPtr client)
REQUEST_SIZE_MATCH(xCopyAreaReq); REQUEST_SIZE_MATCH(xCopyAreaReq);
result = dixLookupResourceByClass((pointer *) &src, stuff->srcDrawable, result = dixLookupResourceByClass((void **) &src, stuff->srcDrawable,
XRC_DRAWABLE, client, DixReadAccess); XRC_DRAWABLE, client, DixReadAccess);
if (result != Success) if (result != Success)
return (result == BadValue) ? BadDrawable : result; return (result == BadValue) ? BadDrawable : result;
srcShared = IS_SHARED_PIXMAP(src); srcShared = IS_SHARED_PIXMAP(src);
result = dixLookupResourceByClass((pointer *) &dst, stuff->dstDrawable, result = dixLookupResourceByClass((void **) &dst, stuff->dstDrawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success) if (result != Success)
return (result == BadValue) ? BadDrawable : result; return (result == BadValue) ? BadDrawable : result;
@ -1077,7 +1077,7 @@ PanoramiXCopyArea(ClientPtr client)
if (dstShared && srcShared) if (dstShared && srcShared)
return (*SavedProcVector[X_CopyArea]) (client); return (*SavedProcVector[X_CopyArea]) (client);
result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -1219,14 +1219,14 @@ PanoramiXCopyPlane(ClientPtr client)
REQUEST_SIZE_MATCH(xCopyPlaneReq); REQUEST_SIZE_MATCH(xCopyPlaneReq);
rc = dixLookupResourceByClass((pointer *) &src, stuff->srcDrawable, rc = dixLookupResourceByClass((void **) &src, stuff->srcDrawable,
XRC_DRAWABLE, client, DixReadAccess); XRC_DRAWABLE, client, DixReadAccess);
if (rc != Success) if (rc != Success)
return (rc == BadValue) ? BadDrawable : rc; return (rc == BadValue) ? BadDrawable : rc;
srcShared = IS_SHARED_PIXMAP(src); srcShared = IS_SHARED_PIXMAP(src);
rc = dixLookupResourceByClass((pointer *) &dst, stuff->dstDrawable, rc = dixLookupResourceByClass((void **) &dst, stuff->dstDrawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (rc != Success) if (rc != Success)
return (rc == BadValue) ? BadDrawable : rc; return (rc == BadValue) ? BadDrawable : rc;
@ -1236,7 +1236,7 @@ PanoramiXCopyPlane(ClientPtr client)
if (dstShared && srcShared) if (dstShared && srcShared)
return (*SavedProcVector[X_CopyPlane]) (client); return (*SavedProcVector[X_CopyPlane]) (client);
rc = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, rc = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess); client, DixReadAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
@ -1327,7 +1327,7 @@ PanoramiXPolyPoint(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xPolyPointReq); REQUEST_AT_LEAST_SIZE(xPolyPointReq);
result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success) if (result != Success)
return (result == BadValue) ? BadDrawable : result; return (result == BadValue) ? BadDrawable : result;
@ -1335,7 +1335,7 @@ PanoramiXPolyPoint(ClientPtr client)
if (IS_SHARED_PIXMAP(draw)) if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_PolyPoint]) (client); return (*SavedProcVector[X_PolyPoint]) (client);
result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -1392,7 +1392,7 @@ PanoramiXPolyLine(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xPolyLineReq); REQUEST_AT_LEAST_SIZE(xPolyLineReq);
result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success) if (result != Success)
return (result == BadValue) ? BadDrawable : result; return (result == BadValue) ? BadDrawable : result;
@ -1400,7 +1400,7 @@ PanoramiXPolyLine(ClientPtr client)
if (IS_SHARED_PIXMAP(draw)) if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_PolyLine]) (client); return (*SavedProcVector[X_PolyLine]) (client);
result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -1457,7 +1457,7 @@ PanoramiXPolySegment(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xPolySegmentReq); REQUEST_AT_LEAST_SIZE(xPolySegmentReq);
result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success) if (result != Success)
return (result == BadValue) ? BadDrawable : result; return (result == BadValue) ? BadDrawable : result;
@ -1465,7 +1465,7 @@ PanoramiXPolySegment(ClientPtr client)
if (IS_SHARED_PIXMAP(draw)) if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_PolySegment]) (client); return (*SavedProcVector[X_PolySegment]) (client);
result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -1525,7 +1525,7 @@ PanoramiXPolyRectangle(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xPolyRectangleReq); REQUEST_AT_LEAST_SIZE(xPolyRectangleReq);
result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success) if (result != Success)
return (result == BadValue) ? BadDrawable : result; return (result == BadValue) ? BadDrawable : result;
@ -1533,7 +1533,7 @@ PanoramiXPolyRectangle(ClientPtr client)
if (IS_SHARED_PIXMAP(draw)) if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_PolyRectangle]) (client); return (*SavedProcVector[X_PolyRectangle]) (client);
result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -1592,7 +1592,7 @@ PanoramiXPolyArc(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xPolyArcReq); REQUEST_AT_LEAST_SIZE(xPolyArcReq);
result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success) if (result != Success)
return (result == BadValue) ? BadDrawable : result; return (result == BadValue) ? BadDrawable : result;
@ -1600,7 +1600,7 @@ PanoramiXPolyArc(ClientPtr client)
if (IS_SHARED_PIXMAP(draw)) if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_PolyArc]) (client); return (*SavedProcVector[X_PolyArc]) (client);
result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -1657,7 +1657,7 @@ PanoramiXFillPoly(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xFillPolyReq); REQUEST_AT_LEAST_SIZE(xFillPolyReq);
result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success) if (result != Success)
return (result == BadValue) ? BadDrawable : result; return (result == BadValue) ? BadDrawable : result;
@ -1665,7 +1665,7 @@ PanoramiXFillPoly(ClientPtr client)
if (IS_SHARED_PIXMAP(draw)) if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_FillPoly]) (client); return (*SavedProcVector[X_FillPoly]) (client);
result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -1723,7 +1723,7 @@ PanoramiXPolyFillRectangle(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xPolyFillRectangleReq); REQUEST_AT_LEAST_SIZE(xPolyFillRectangleReq);
result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success) if (result != Success)
return (result == BadValue) ? BadDrawable : result; return (result == BadValue) ? BadDrawable : result;
@ -1731,7 +1731,7 @@ PanoramiXPolyFillRectangle(ClientPtr client)
if (IS_SHARED_PIXMAP(draw)) if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_PolyFillRectangle]) (client); return (*SavedProcVector[X_PolyFillRectangle]) (client);
result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -1790,7 +1790,7 @@ PanoramiXPolyFillArc(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xPolyFillArcReq); REQUEST_AT_LEAST_SIZE(xPolyFillArcReq);
result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success) if (result != Success)
return (result == BadValue) ? BadDrawable : result; return (result == BadValue) ? BadDrawable : result;
@ -1798,7 +1798,7 @@ PanoramiXPolyFillArc(ClientPtr client)
if (IS_SHARED_PIXMAP(draw)) if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_PolyFillArc]) (client); return (*SavedProcVector[X_PolyFillArc]) (client);
result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -1855,7 +1855,7 @@ PanoramiXPutImage(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xPutImageReq); REQUEST_AT_LEAST_SIZE(xPutImageReq);
result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success) if (result != Success)
return (result == BadValue) ? BadDrawable : result; return (result == BadValue) ? BadDrawable : result;
@ -1863,7 +1863,7 @@ PanoramiXPutImage(ClientPtr client)
if (IS_SHARED_PIXMAP(draw)) if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_PutImage]) (client); return (*SavedProcVector[X_PutImage]) (client);
result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -1909,7 +1909,7 @@ PanoramiXGetImage(ClientPtr client)
return BadValue; return BadValue;
} }
rc = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, rc = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (rc != Success) if (rc != Success)
return (rc == BadValue) ? BadDrawable : rc; return (rc == BadValue) ? BadDrawable : rc;
@ -2055,7 +2055,7 @@ PanoramiXPolyText8(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xPolyTextReq); REQUEST_AT_LEAST_SIZE(xPolyTextReq);
result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success) if (result != Success)
return (result == BadValue) ? BadDrawable : result; return (result == BadValue) ? BadDrawable : result;
@ -2063,7 +2063,7 @@ PanoramiXPolyText8(ClientPtr client)
if (IS_SHARED_PIXMAP(draw)) if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_PolyText8]) (client); return (*SavedProcVector[X_PolyText8]) (client);
result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -2098,7 +2098,7 @@ PanoramiXPolyText16(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xPolyTextReq); REQUEST_AT_LEAST_SIZE(xPolyTextReq);
result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success) if (result != Success)
return (result == BadValue) ? BadDrawable : result; return (result == BadValue) ? BadDrawable : result;
@ -2106,7 +2106,7 @@ PanoramiXPolyText16(ClientPtr client)
if (IS_SHARED_PIXMAP(draw)) if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_PolyText16]) (client); return (*SavedProcVector[X_PolyText16]) (client);
result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -2141,7 +2141,7 @@ PanoramiXImageText8(ClientPtr client)
REQUEST_FIXED_SIZE(xImageTextReq, stuff->nChars); REQUEST_FIXED_SIZE(xImageTextReq, stuff->nChars);
result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success) if (result != Success)
return (result == BadValue) ? BadDrawable : result; return (result == BadValue) ? BadDrawable : result;
@ -2149,7 +2149,7 @@ PanoramiXImageText8(ClientPtr client)
if (IS_SHARED_PIXMAP(draw)) if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_ImageText8]) (client); return (*SavedProcVector[X_ImageText8]) (client);
result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -2184,7 +2184,7 @@ PanoramiXImageText16(ClientPtr client)
REQUEST_FIXED_SIZE(xImageTextReq, stuff->nChars << 1); REQUEST_FIXED_SIZE(xImageTextReq, stuff->nChars << 1);
result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success) if (result != Success)
return (result == BadValue) ? BadDrawable : result; return (result == BadValue) ? BadDrawable : result;
@ -2192,7 +2192,7 @@ PanoramiXImageText16(ClientPtr client)
if (IS_SHARED_PIXMAP(draw)) if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_ImageText16]) (client); return (*SavedProcVector[X_ImageText16]) (client);
result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -2225,7 +2225,7 @@ PanoramiXCreateColormap(ClientPtr client)
REQUEST_SIZE_MATCH(xCreateColormapReq); REQUEST_SIZE_MATCH(xCreateColormapReq);
result = dixLookupResourceByType((pointer *) &win, stuff->window, result = dixLookupResourceByType((void **) &win, stuff->window,
XRT_WINDOW, client, DixReadAccess); XRT_WINDOW, client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -2266,7 +2266,7 @@ PanoramiXFreeColormap(ClientPtr client)
client->errorValue = stuff->id; client->errorValue = stuff->id;
result = dixLookupResourceByType((pointer *) &cmap, stuff->id, XRT_COLORMAP, result = dixLookupResourceByType((void **) &cmap, stuff->id, XRT_COLORMAP,
client, DixDestroyAccess); client, DixDestroyAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -2296,7 +2296,7 @@ PanoramiXCopyColormapAndFree(ClientPtr client)
client->errorValue = stuff->srcCmap; client->errorValue = stuff->srcCmap;
result = dixLookupResourceByType((pointer *) &cmap, stuff->srcCmap, result = dixLookupResourceByType((void **) &cmap, stuff->srcCmap,
XRT_COLORMAP, client, XRT_COLORMAP, client,
DixReadAccess | DixWriteAccess); DixReadAccess | DixWriteAccess);
if (result != Success) if (result != Success)
@ -2335,7 +2335,7 @@ PanoramiXInstallColormap(ClientPtr client)
client->errorValue = stuff->id; client->errorValue = stuff->id;
result = dixLookupResourceByType((pointer *) &cmap, stuff->id, XRT_COLORMAP, result = dixLookupResourceByType((void **) &cmap, stuff->id, XRT_COLORMAP,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -2360,7 +2360,7 @@ PanoramiXUninstallColormap(ClientPtr client)
client->errorValue = stuff->id; client->errorValue = stuff->id;
result = dixLookupResourceByType((pointer *) &cmap, stuff->id, XRT_COLORMAP, result = dixLookupResourceByType((void **) &cmap, stuff->id, XRT_COLORMAP,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -2386,7 +2386,7 @@ PanoramiXAllocColor(ClientPtr client)
client->errorValue = stuff->cmap; client->errorValue = stuff->cmap;
result = dixLookupResourceByType((pointer *) &cmap, stuff->cmap, result = dixLookupResourceByType((void **) &cmap, stuff->cmap,
XRT_COLORMAP, client, DixWriteAccess); XRT_COLORMAP, client, DixWriteAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -2412,7 +2412,7 @@ PanoramiXAllocNamedColor(ClientPtr client)
client->errorValue = stuff->cmap; client->errorValue = stuff->cmap;
result = dixLookupResourceByType((pointer *) &cmap, stuff->cmap, result = dixLookupResourceByType((void **) &cmap, stuff->cmap,
XRT_COLORMAP, client, DixWriteAccess); XRT_COLORMAP, client, DixWriteAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -2438,7 +2438,7 @@ PanoramiXAllocColorCells(ClientPtr client)
client->errorValue = stuff->cmap; client->errorValue = stuff->cmap;
result = dixLookupResourceByType((pointer *) &cmap, stuff->cmap, result = dixLookupResourceByType((void **) &cmap, stuff->cmap,
XRT_COLORMAP, client, DixWriteAccess); XRT_COLORMAP, client, DixWriteAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -2464,7 +2464,7 @@ PanoramiXAllocColorPlanes(ClientPtr client)
client->errorValue = stuff->cmap; client->errorValue = stuff->cmap;
result = dixLookupResourceByType((pointer *) &cmap, stuff->cmap, result = dixLookupResourceByType((void **) &cmap, stuff->cmap,
XRT_COLORMAP, client, DixWriteAccess); XRT_COLORMAP, client, DixWriteAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -2490,7 +2490,7 @@ PanoramiXFreeColors(ClientPtr client)
client->errorValue = stuff->cmap; client->errorValue = stuff->cmap;
result = dixLookupResourceByType((pointer *) &cmap, stuff->cmap, result = dixLookupResourceByType((void **) &cmap, stuff->cmap,
XRT_COLORMAP, client, DixWriteAccess); XRT_COLORMAP, client, DixWriteAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -2514,7 +2514,7 @@ PanoramiXStoreColors(ClientPtr client)
client->errorValue = stuff->cmap; client->errorValue = stuff->cmap;
result = dixLookupResourceByType((pointer *) &cmap, stuff->cmap, result = dixLookupResourceByType((void **) &cmap, stuff->cmap,
XRT_COLORMAP, client, DixWriteAccess); XRT_COLORMAP, client, DixWriteAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -2540,7 +2540,7 @@ PanoramiXStoreNamedColor(ClientPtr client)
client->errorValue = stuff->cmap; client->errorValue = stuff->cmap;
result = dixLookupResourceByType((pointer *) &cmap, stuff->cmap, result = dixLookupResourceByType((void **) &cmap, stuff->cmap,
XRT_COLORMAP, client, DixWriteAccess); XRT_COLORMAP, client, DixWriteAccess);
if (result != Success) if (result != Success)
return result; return result;

2
Xext/panoramiXsrv.h
View File

@ -19,7 +19,7 @@ extern _X_EXPORT Bool PanoramiXCreateConnectionBlock(void);
extern _X_EXPORT PanoramiXRes *PanoramiXFindIDByScrnum(RESTYPE, XID, int); extern _X_EXPORT PanoramiXRes *PanoramiXFindIDByScrnum(RESTYPE, XID, int);
extern _X_EXPORT Bool extern _X_EXPORT Bool
XineramaRegisterConnectionBlockCallback(void (*func) (void)); XineramaRegisterConnectionBlockCallback(void (*func) (void));
extern _X_EXPORT int XineramaDeleteResource(pointer, XID); extern _X_EXPORT int XineramaDeleteResource(void *, XID);
extern _X_EXPORT void XineramaReinitData(void); extern _X_EXPORT void XineramaReinitData(void);

40
Xext/saver.c
View File

@ -107,7 +107,7 @@ typedef struct _ScreenSaverSuspension {
int count; int count;
} ScreenSaverSuspensionRec; } ScreenSaverSuspensionRec;
static int ScreenSaverFreeSuspend(pointer /*value */ , static int ScreenSaverFreeSuspend(void */*value */ ,
XID /* id */ XID /* id */
); );
@ -131,7 +131,7 @@ typedef struct _ScreenSaverEvent {
CARD32 mask; CARD32 mask;
} ScreenSaverEventRec; } ScreenSaverEventRec;
static int ScreenSaverFreeEvents(pointer /* value */ , static int ScreenSaverFreeEvents(void * /* value */ ,
XID /* id */ XID /* id */
); );
@ -168,7 +168,7 @@ typedef struct _ScreenSaverAttr {
unsigned long *values; unsigned long *values;
} ScreenSaverAttrRec, *ScreenSaverAttrPtr; } ScreenSaverAttrRec, *ScreenSaverAttrPtr;
static int ScreenSaverFreeAttr(pointer /* value */ , static int ScreenSaverFreeAttr(void */* value */ ,
XID /* id */ XID /* id */
); );
@ -288,7 +288,7 @@ setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask)
pEv->client = client; pEv->client = client;
pEv->screen = pScreen; pEv->screen = pScreen;
pEv->resource = FakeClientID(client->index); pEv->resource = FakeClientID(client->index);
if (!AddResource(pEv->resource, SaverEventType, (pointer) pEv)) if (!AddResource(pEv->resource, SaverEventType, (void *) pEv))
return FALSE; return FALSE;
} }
pEv->mask = mask; pEv->mask = mask;
@ -319,7 +319,7 @@ FreeScreenAttr(ScreenSaverAttrPtr pAttr)
} }
static int static int
ScreenSaverFreeEvents(pointer value, XID id) ScreenSaverFreeEvents(void *value, XID id)
{ {
ScreenSaverEventPtr pOld = (ScreenSaverEventPtr) value; ScreenSaverEventPtr pOld = (ScreenSaverEventPtr) value;
ScreenPtr pScreen = pOld->screen; ScreenPtr pScreen = pOld->screen;
@ -341,7 +341,7 @@ ScreenSaverFreeEvents(pointer value, XID id)
} }
static int static int
ScreenSaverFreeAttr(pointer value, XID id) ScreenSaverFreeAttr(void *value, XID id)
{ {
ScreenSaverAttrPtr pOldAttr = (ScreenSaverAttrPtr) value; ScreenSaverAttrPtr pOldAttr = (ScreenSaverAttrPtr) value;
ScreenPtr pScreen = pOldAttr->screen; ScreenPtr pScreen = pOldAttr->screen;
@ -363,7 +363,7 @@ ScreenSaverFreeAttr(pointer value, XID id)
} }
static int static int
ScreenSaverFreeSuspend(pointer value, XID id) ScreenSaverFreeSuspend(void *value, XID id)
{ {
ScreenSaverSuspensionPtr data = (ScreenSaverSuspensionPtr) value; ScreenSaverSuspensionPtr data = (ScreenSaverSuspensionPtr) value;
ScreenSaverSuspensionPtr *prev, this; ScreenSaverSuspensionPtr *prev, this;
@ -460,7 +460,7 @@ UninstallSaverColormap(ScreenPtr pScreen)
int rc; int rc;
if (pPriv && pPriv->installedMap != None) { if (pPriv && pPriv->installedMap != None) {
rc = dixLookupResourceByType((pointer *) &pCmap, pPriv->installedMap, rc = dixLookupResourceByType((void **) &pCmap, pPriv->installedMap,
RT_COLORMAP, serverClient, RT_COLORMAP, serverClient,
DixUninstallAccess); DixUninstallAccess);
if (rc == Success) if (rc == Success)
@ -571,7 +571,7 @@ CreateSaverWindow(ScreenPtr pScreen)
if (i < numInstalled) if (i < numInstalled)
return TRUE; return TRUE;
result = dixLookupResourceByType((pointer *) &pCmap, wantMap, RT_COLORMAP, result = dixLookupResourceByType((void **) &pCmap, wantMap, RT_COLORMAP,
serverClient, DixInstallAccess); serverClient, DixInstallAccess);
if (result != Success) if (result != Success)
return TRUE; return TRUE;
@ -923,7 +923,7 @@ ScreenSaverSetAttributes(ClientPtr client)
} }
else { else {
ret = ret =
dixLookupResourceByType((pointer *) &pPixmap, pixID, dixLookupResourceByType((void **) &pPixmap, pixID,
RT_PIXMAP, client, DixReadAccess); RT_PIXMAP, client, DixReadAccess);
if (ret == Success) { if (ret == Success) {
if ((pPixmap->drawable.depth != depth) || if ((pPixmap->drawable.depth != depth) ||
@ -955,7 +955,7 @@ ScreenSaverSetAttributes(ClientPtr client)
} }
else { else {
ret = ret =
dixLookupResourceByType((pointer *) &pPixmap, pixID, dixLookupResourceByType((void **) &pPixmap, pixID,
RT_PIXMAP, client, DixReadAccess); RT_PIXMAP, client, DixReadAccess);
if (ret == Success) { if (ret == Success) {
if ((pPixmap->drawable.depth != depth) || if ((pPixmap->drawable.depth != depth) ||
@ -1039,7 +1039,7 @@ ScreenSaverSetAttributes(ClientPtr client)
break; break;
case CWColormap: case CWColormap:
cmap = (Colormap) * pVlist; cmap = (Colormap) * pVlist;
ret = dixLookupResourceByType((pointer *) &pCmap, cmap, RT_COLORMAP, ret = dixLookupResourceByType((void **) &pCmap, cmap, RT_COLORMAP,
client, DixUseAccess); client, DixUseAccess);
if (ret != Success) { if (ret != Success) {
client->errorValue = cmap; client->errorValue = cmap;
@ -1058,7 +1058,7 @@ ScreenSaverSetAttributes(ClientPtr client)
*values++ = None; *values++ = None;
} }
else { else {
ret = dixLookupResourceByType((pointer *) &pCursor, cursorID, ret = dixLookupResourceByType((void **) &pCursor, cursorID,
RT_CURSOR, client, DixUseAccess); RT_CURSOR, client, DixUseAccess);
if (ret != Success) { if (ret != Success) {
client->errorValue = cursorID; client->errorValue = cursorID;
@ -1079,7 +1079,7 @@ ScreenSaverSetAttributes(ClientPtr client)
FreeScreenAttr(pPriv->attr); FreeScreenAttr(pPriv->attr);
pPriv->attr = pAttr; pPriv->attr = pAttr;
pAttr->resource = FakeClientID(client->index); pAttr->resource = FakeClientID(client->index);
if (!AddResource(pAttr->resource, AttrType, (pointer) pAttr)) if (!AddResource(pAttr->resource, AttrType, (void *) pAttr))
return BadAlloc; return BadAlloc;
return Success; return Success;
PatchUp: PatchUp:
@ -1131,7 +1131,7 @@ ProcScreenSaverSetAttributes(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xScreenSaverSetAttributesReq); REQUEST_AT_LEAST_SIZE(xScreenSaverSetAttributesReq);
status = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, status = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (status != Success) if (status != Success)
return (status == BadValue) ? BadDrawable : status; return (status == BadValue) ? BadDrawable : status;
@ -1146,7 +1146,7 @@ ProcScreenSaverSetAttributes(ClientPtr client)
pback_offset = Ones((Mask) stuff->mask & (CWBackPixmap - 1)); pback_offset = Ones((Mask) stuff->mask & (CWBackPixmap - 1));
tmp = *((CARD32 *) &stuff[1] + pback_offset); tmp = *((CARD32 *) &stuff[1] + pback_offset);
if ((tmp != None) && (tmp != ParentRelative)) { if ((tmp != None) && (tmp != ParentRelative)) {
status = dixLookupResourceByType((pointer *) &backPix, tmp, status = dixLookupResourceByType((void **) &backPix, tmp,
XRT_PIXMAP, client, XRT_PIXMAP, client,
DixReadAccess); DixReadAccess);
if (status != Success) if (status != Success)
@ -1158,7 +1158,7 @@ ProcScreenSaverSetAttributes(ClientPtr client)
pbord_offset = Ones((Mask) stuff->mask & (CWBorderPixmap - 1)); pbord_offset = Ones((Mask) stuff->mask & (CWBorderPixmap - 1));
tmp = *((CARD32 *) &stuff[1] + pbord_offset); tmp = *((CARD32 *) &stuff[1] + pbord_offset);
if (tmp != CopyFromParent) { if (tmp != CopyFromParent) {
status = dixLookupResourceByType((pointer *) &bordPix, tmp, status = dixLookupResourceByType((void **) &bordPix, tmp,
XRT_PIXMAP, client, XRT_PIXMAP, client,
DixReadAccess); DixReadAccess);
if (status != Success) if (status != Success)
@ -1170,7 +1170,7 @@ ProcScreenSaverSetAttributes(ClientPtr client)
cmap_offset = Ones((Mask) stuff->mask & (CWColormap - 1)); cmap_offset = Ones((Mask) stuff->mask & (CWColormap - 1));
tmp = *((CARD32 *) &stuff[1] + cmap_offset); tmp = *((CARD32 *) &stuff[1] + cmap_offset);
if ((tmp != CopyFromParent) && (tmp != None)) { if ((tmp != CopyFromParent) && (tmp != None)) {
status = dixLookupResourceByType((pointer *) &cmap, tmp, status = dixLookupResourceByType((void **) &cmap, tmp,
XRT_COLORMAP, client, XRT_COLORMAP, client,
DixReadAccess); DixReadAccess);
if (status != Success) if (status != Success)
@ -1211,7 +1211,7 @@ ProcScreenSaverUnsetAttributes(ClientPtr client)
PanoramiXRes *draw; PanoramiXRes *draw;
int rc, i; int rc, i;
rc = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, rc = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (rc != Success) if (rc != Success)
return (rc == BadValue) ? BadDrawable : rc; return (rc == BadValue) ? BadDrawable : rc;
@ -1270,7 +1270,7 @@ ProcScreenSaverSuspend(ClientPtr client)
this->count = 1; this->count = 1;
this->clientResource = FakeClientID(client->index); this->clientResource = FakeClientID(client->index);
if (!AddResource(this->clientResource, SuspendType, (pointer) this)) { if (!AddResource(this->clientResource, SuspendType, (void *) this)) {
free(this); free(this);
return BadAlloc; return BadAlloc;
} }

34
Xext/security.c
View File

@ -167,7 +167,7 @@ SecurityLookupRequestName(ClientPtr client)
*/ */
static int static int
SecurityDeleteAuthorization(pointer value, XID id) SecurityDeleteAuthorization(void *value, XID id)
{ {
SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr) value; SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr) value;
unsigned short name_len, data_len; unsigned short name_len, data_len;
@ -221,7 +221,7 @@ SecurityDeleteAuthorization(pointer value, XID id)
/* resource delete function for RTEventClient */ /* resource delete function for RTEventClient */
static int static int
SecurityDeleteAuthorizationEventClient(pointer value, XID id) SecurityDeleteAuthorizationEventClient(void *value, XID id)
{ {
OtherClientsPtr pEventClient, prev = NULL; OtherClientsPtr pEventClient, prev = NULL;
SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr) value; SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr) value;
@ -294,7 +294,7 @@ SecurityComputeAuthorizationTimeout(SecurityAuthorizationPtr pAuth,
*/ */
static CARD32 static CARD32
SecurityAuthorizationExpired(OsTimerPtr timer, CARD32 time, pointer pval) SecurityAuthorizationExpired(OsTimerPtr timer, CARD32 time, void *pval)
{ {
SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr) pval; SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr) pval;
@ -382,7 +382,7 @@ SecurityEventSelectForAuthorization(SecurityAuthorizationPtr pAuth,
pEventClient->mask = mask; pEventClient->mask = mask;
pEventClient->resource = FakeClientID(client->index); pEventClient->resource = FakeClientID(client->index);
pEventClient->next = pAuth->eventClients; pEventClient->next = pAuth->eventClients;
if (!AddResource(pEventClient->resource, RTEventClient, (pointer) pAuth)) { if (!AddResource(pEventClient->resource, RTEventClient, (void *) pAuth)) {
free(pEventClient); free(pEventClient);
return BadAlloc; return BadAlloc;
} }
@ -454,7 +454,7 @@ ProcSecurityGenerateAuthorization(ClientPtr client)
vgi.group = group; vgi.group = group;
vgi.valid = FALSE; vgi.valid = FALSE;
CallCallbacks(&SecurityValidateGroupCallback, (pointer) &vgi); CallCallbacks(&SecurityValidateGroupCallback, (void *) &vgi);
/* if nobody said they recognized it, it's an error */ /* if nobody said they recognized it, it's an error */
@ -575,7 +575,7 @@ ProcSecurityRevokeAuthorization(ClientPtr client)
REQUEST_SIZE_MATCH(xSecurityRevokeAuthorizationReq); REQUEST_SIZE_MATCH(xSecurityRevokeAuthorizationReq);
rc = dixLookupResourceByType((pointer *) &pAuth, stuff->authId, rc = dixLookupResourceByType((void **) &pAuth, stuff->authId,
SecurityAuthorizationResType, client, SecurityAuthorizationResType, client,
DixDestroyAccess); DixDestroyAccess);
if (rc != Success) if (rc != Success)
@ -693,7 +693,7 @@ SwapSecurityAuthorizationRevokedEvent(xSecurityAuthorizationRevokedEvent * from,
*/ */
static void static void
SecurityDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata) SecurityDevice(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
XaceDeviceAccessRec *rec = calldata; XaceDeviceAccessRec *rec = calldata;
SecurityStateRec *subj, *obj; SecurityStateRec *subj, *obj;
@ -737,7 +737,7 @@ SecurityDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata)
*/ */
static void static void
SecurityResource(CallbackListPtr *pcbl, pointer unused, pointer calldata) SecurityResource(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
XaceResourceAccessRec *rec = calldata; XaceResourceAccessRec *rec = calldata;
SecurityStateRec *subj, *obj; SecurityStateRec *subj, *obj;
@ -785,7 +785,7 @@ SecurityResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
} }
static void static void
SecurityExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata) SecurityExtension(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
XaceExtAccessRec *rec = calldata; XaceExtAccessRec *rec = calldata;
SecurityStateRec *subj; SecurityStateRec *subj;
@ -808,7 +808,7 @@ SecurityExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
} }
static void static void
SecurityServer(CallbackListPtr *pcbl, pointer unused, pointer calldata) SecurityServer(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
XaceServerAccessRec *rec = calldata; XaceServerAccessRec *rec = calldata;
SecurityStateRec *subj, *obj; SecurityStateRec *subj, *obj;
@ -827,7 +827,7 @@ SecurityServer(CallbackListPtr *pcbl, pointer unused, pointer calldata)
} }
static void static void
SecurityClient(CallbackListPtr *pcbl, pointer unused, pointer calldata) SecurityClient(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
XaceClientAccessRec *rec = calldata; XaceClientAccessRec *rec = calldata;
SecurityStateRec *subj, *obj; SecurityStateRec *subj, *obj;
@ -846,7 +846,7 @@ SecurityClient(CallbackListPtr *pcbl, pointer unused, pointer calldata)
} }
static void static void
SecurityProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata) SecurityProperty(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
XacePropertyAccessRec *rec = calldata; XacePropertyAccessRec *rec = calldata;
SecurityStateRec *subj, *obj; SecurityStateRec *subj, *obj;
@ -868,7 +868,7 @@ SecurityProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
} }
static void static void
SecuritySend(CallbackListPtr *pcbl, pointer unused, pointer calldata) SecuritySend(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
XaceSendAccessRec *rec = calldata; XaceSendAccessRec *rec = calldata;
SecurityStateRec *subj, *obj; SecurityStateRec *subj, *obj;
@ -900,7 +900,7 @@ SecuritySend(CallbackListPtr *pcbl, pointer unused, pointer calldata)
} }
static void static void
SecurityReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata) SecurityReceive(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
XaceReceiveAccessRec *rec = calldata; XaceReceiveAccessRec *rec = calldata;
SecurityStateRec *subj, *obj; SecurityStateRec *subj, *obj;
@ -941,7 +941,7 @@ SecurityReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata)
*/ */
static void static void
SecurityClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata) SecurityClientState(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
NewClientInfoRec *pci = calldata; NewClientInfoRec *pci = calldata;
SecurityStateRec *state; SecurityStateRec *state;
@ -960,7 +960,7 @@ SecurityClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
case ClientStateRunning: case ClientStateRunning:
state->authId = AuthorizationIDOfClient(pci->client); state->authId = AuthorizationIDOfClient(pci->client);
rc = dixLookupResourceByType((pointer *) &pAuth, state->authId, rc = dixLookupResourceByType((void **) &pAuth, state->authId,
SecurityAuthorizationResType, serverClient, SecurityAuthorizationResType, serverClient,
DixGetAttrAccess); DixGetAttrAccess);
if (rc == Success) { if (rc == Success) {
@ -976,7 +976,7 @@ SecurityClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
case ClientStateGone: case ClientStateGone:
case ClientStateRetained: case ClientStateRetained:
rc = dixLookupResourceByType((pointer *) &pAuth, state->authId, rc = dixLookupResourceByType((void **) &pAuth, state->authId,
SecurityAuthorizationResType, serverClient, SecurityAuthorizationResType, serverClient,
DixGetAttrAccess); DixGetAttrAccess);
if (rc == Success && state->live) { if (rc == Success && state->live) {

46
Xext/shape.c
View File

@ -50,11 +50,11 @@ in this Software without prior written authorization from The Open Group.
typedef RegionPtr (*CreateDftPtr) (WindowPtr /* pWin */ typedef RegionPtr (*CreateDftPtr) (WindowPtr /* pWin */
); );
static int ShapeFreeClient(pointer /* data */ , static int ShapeFreeClient(void * /* data */ ,
XID /* id */ XID /* id */
); );
static int ShapeFreeEvents(pointer /* data */ , static int ShapeFreeEvents(void * /* data */ ,
XID /* id */ XID /* id */
); );
static void SShapeNotifyEvent(xShapeNotifyEvent * /* from */ , static void SShapeNotifyEvent(xShapeNotifyEvent * /* from */ ,
xShapeNotifyEvent * /* to */ xShapeNotifyEvent * /* to */
@ -306,7 +306,7 @@ ProcPanoramiXShapeRectangles(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xShapeRectanglesReq); REQUEST_AT_LEAST_SIZE(xShapeRectanglesReq);
result = dixLookupResourceByType((pointer *) &win, stuff->dest, XRT_WINDOW, result = dixLookupResourceByType((void **) &win, stuff->dest, XRT_WINDOW,
client, DixWriteAccess); client, DixWriteAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -361,7 +361,7 @@ ProcShapeMask(ClientPtr client)
if (stuff->src == None) if (stuff->src == None)
srcRgn = 0; srcRgn = 0;
else { else {
rc = dixLookupResourceByType((pointer *) &pPixmap, stuff->src, rc = dixLookupResourceByType((void **) &pPixmap, stuff->src,
RT_PIXMAP, client, DixReadAccess); RT_PIXMAP, client, DixReadAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
@ -404,13 +404,13 @@ ProcPanoramiXShapeMask(ClientPtr client)
REQUEST_SIZE_MATCH(xShapeMaskReq); REQUEST_SIZE_MATCH(xShapeMaskReq);
result = dixLookupResourceByType((pointer *) &win, stuff->dest, XRT_WINDOW, result = dixLookupResourceByType((void **) &win, stuff->dest, XRT_WINDOW,
client, DixWriteAccess); client, DixWriteAccess);
if (result != Success) if (result != Success)
return result; return result;
if (stuff->src != None) { if (stuff->src != None) {
result = dixLookupResourceByType((pointer *) &pmap, stuff->src, result = dixLookupResourceByType((void **) &pmap, stuff->src,
XRT_PIXMAP, client, DixReadAccess); XRT_PIXMAP, client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -532,12 +532,12 @@ ProcPanoramiXShapeCombine(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xShapeCombineReq); REQUEST_AT_LEAST_SIZE(xShapeCombineReq);
result = dixLookupResourceByType((pointer *) &win, stuff->dest, XRT_WINDOW, result = dixLookupResourceByType((void **) &win, stuff->dest, XRT_WINDOW,
client, DixWriteAccess); client, DixWriteAccess);
if (result != Success) if (result != Success)
return result; return result;
result = dixLookupResourceByType((pointer *) &win2, stuff->src, XRT_WINDOW, result = dixLookupResourceByType((void **) &win2, stuff->src, XRT_WINDOW,
client, DixReadAccess); client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -603,7 +603,7 @@ ProcPanoramiXShapeOffset(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xShapeOffsetReq); REQUEST_AT_LEAST_SIZE(xShapeOffsetReq);
result = dixLookupResourceByType((pointer *) &win, stuff->dest, XRT_WINDOW, result = dixLookupResourceByType((void **) &win, stuff->dest, XRT_WINDOW,
client, DixWriteAccess); client, DixWriteAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -686,7 +686,7 @@ ProcShapeQueryExtents(ClientPtr client)
} }
/*ARGSUSED*/ static int /*ARGSUSED*/ static int
ShapeFreeClient(pointer data, XID id) ShapeFreeClient(void *data, XID id)
{ {
ShapeEventPtr pShapeEvent; ShapeEventPtr pShapeEvent;
WindowPtr pWin; WindowPtr pWin;
@ -695,7 +695,7 @@ ShapeFreeClient(pointer data, XID id)
pShapeEvent = (ShapeEventPtr) data; pShapeEvent = (ShapeEventPtr) data;
pWin = pShapeEvent->window; pWin = pShapeEvent->window;
rc = dixLookupResourceByType((pointer *) &pHead, pWin->drawable.id, rc = dixLookupResourceByType((void **) &pHead, pWin->drawable.id,
ShapeEventType, serverClient, DixReadAccess); ShapeEventType, serverClient, DixReadAccess);
if (rc == Success) { if (rc == Success) {
pPrev = 0; pPrev = 0;
@ -708,12 +708,12 @@ ShapeFreeClient(pointer data, XID id)
*pHead = pShapeEvent->next; *pHead = pShapeEvent->next;
} }
} }
free((pointer) pShapeEvent); free((void *) pShapeEvent);
return 1; return 1;
} }
/*ARGSUSED*/ static int /*ARGSUSED*/ static int
ShapeFreeEvents(pointer data, XID id) ShapeFreeEvents(void *data, XID id)
{ {
ShapeEventPtr *pHead, pCur, pNext; ShapeEventPtr *pHead, pCur, pNext;
@ -721,9 +721,9 @@ ShapeFreeEvents(pointer data, XID id)
for (pCur = *pHead; pCur; pCur = pNext) { for (pCur = *pHead; pCur; pCur = pNext) {
pNext = pCur->next; pNext = pCur->next;
FreeResource(pCur->clientResource, ClientType); FreeResource(pCur->clientResource, ClientType);
free((pointer) pCur); free((void *) pCur);
} }
free((pointer) pHead); free((void *) pHead);
return 1; return 1;
} }
@ -740,7 +740,7 @@ ProcShapeSelectInput(ClientPtr client)
rc = dixLookupWindow(&pWin, stuff->window, client, DixReceiveAccess); rc = dixLookupWindow(&pWin, stuff->window, client, DixReceiveAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
rc = dixLookupResourceByType((pointer *) &pHead, pWin->drawable.id, rc = dixLookupResourceByType((void **) &pHead, pWin->drawable.id,
ShapeEventType, client, DixWriteAccess); ShapeEventType, client, DixWriteAccess);
if (rc != Success && rc != BadValue) if (rc != Success && rc != BadValue)
return rc; return rc;
@ -770,10 +770,10 @@ ProcShapeSelectInput(ClientPtr client)
*/ */
clientResource = FakeClientID(client->index); clientResource = FakeClientID(client->index);
pNewShapeEvent->clientResource = clientResource; pNewShapeEvent->clientResource = clientResource;
if (!AddResource(clientResource, ClientType, (pointer) pNewShapeEvent)) if (!AddResource(clientResource, ClientType, (void *) pNewShapeEvent))
return BadAlloc; return BadAlloc;
/* /*
* create a resource to contain a pointer to the list * create a resource to contain a void *to the list
* of clients selecting input. This must be indirect as * of clients selecting input. This must be indirect as
* the list may be arbitrarily rearranged which cannot be * the list may be arbitrarily rearranged which cannot be
* done through the resource database. * done through the resource database.
@ -782,7 +782,7 @@ ProcShapeSelectInput(ClientPtr client)
pHead = malloc(sizeof(ShapeEventPtr)); pHead = malloc(sizeof(ShapeEventPtr));
if (!pHead || if (!pHead ||
!AddResource(pWin->drawable.id, ShapeEventType, !AddResource(pWin->drawable.id, ShapeEventType,
(pointer) pHead)) { (void *) pHead)) {
FreeResource(clientResource, RT_NONE); FreeResource(clientResource, RT_NONE);
return BadAlloc; return BadAlloc;
} }
@ -831,7 +831,7 @@ SendShapeNotify(WindowPtr pWin, int which)
BYTE shaped; BYTE shaped;
int rc; int rc;
rc = dixLookupResourceByType((pointer *) &pHead, pWin->drawable.id, rc = dixLookupResourceByType((void **) &pHead, pWin->drawable.id,
ShapeEventType, serverClient, DixReadAccess); ShapeEventType, serverClient, DixReadAccess);
if (rc != Success) if (rc != Success)
return; return;
@ -910,7 +910,7 @@ ProcShapeInputSelected(ClientPtr client)
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
rc = dixLookupResourceByType((pointer *) &pHead, pWin->drawable.id, rc = dixLookupResourceByType((void **) &pHead, pWin->drawable.id,
ShapeEventType, client, DixReadAccess); ShapeEventType, client, DixReadAccess);
if (rc != Success && rc != BadValue) if (rc != Success && rc != BadValue)
return rc; return rc;

26
Xext/shm.c
View File

@ -99,7 +99,7 @@ typedef struct _ShmScrPrivateRec {
} ShmScrPrivateRec; } ShmScrPrivateRec;
static PixmapPtr fbShmCreatePixmap(XSHM_CREATE_PIXMAP_ARGS); static PixmapPtr fbShmCreatePixmap(XSHM_CREATE_PIXMAP_ARGS);
static int ShmDetachSegment(pointer /* value */ , static int ShmDetachSegment(void */* value */ ,
XID /* shmseg */ XID /* shmseg */
); );
static void ShmResetProc(ExtensionEntry * /* extEntry */ static void ShmResetProc(ExtensionEntry * /* extEntry */
@ -130,7 +130,7 @@ static ShmFuncs fbFuncs = { fbShmCreatePixmap, NULL };
#define VERIFY_SHMSEG(shmseg,shmdesc,client) \ #define VERIFY_SHMSEG(shmseg,shmdesc,client) \
{ \ { \
int tmprc; \ int tmprc; \
tmprc = dixLookupResourceByType((pointer *)&(shmdesc), shmseg, ShmSegType, \ tmprc = dixLookupResourceByType((void **)&(shmdesc), shmseg, ShmSegType, \
client, DixReadAccess); \ client, DixReadAccess); \
if (tmprc != Success) \ if (tmprc != Success) \
return tmprc; \ return tmprc; \
@ -260,7 +260,7 @@ ShmDestroyPixmap(PixmapPtr pPixmap)
shmdesc = (ShmDescPtr) dixLookupPrivate(&pPixmap->devPrivates, shmdesc = (ShmDescPtr) dixLookupPrivate(&pPixmap->devPrivates,
shmPixmapPrivateKey); shmPixmapPrivateKey);
if (shmdesc) if (shmdesc)
ShmDetachSegment((pointer) shmdesc, pPixmap->drawable.id); ShmDetachSegment((void *) shmdesc, pPixmap->drawable.id);
} }
pScreen->DestroyPixmap = screen_priv->destroyPixmap; pScreen->DestroyPixmap = screen_priv->destroyPixmap;
@ -425,13 +425,13 @@ ProcShmAttach(ClientPtr client)
shmdesc->next = Shmsegs; shmdesc->next = Shmsegs;
Shmsegs = shmdesc; Shmsegs = shmdesc;
} }
if (!AddResource(stuff->shmseg, ShmSegType, (pointer) shmdesc)) if (!AddResource(stuff->shmseg, ShmSegType, (void *) shmdesc))
return BadAlloc; return BadAlloc;
return Success; return Success;
} }
/*ARGSUSED*/ static int /*ARGSUSED*/ static int
ShmDetachSegment(pointer value, /* must conform to DeleteType */ ShmDetachSegment(void *value, /* must conform to DeleteType */
XID shmseg) XID shmseg)
{ {
ShmDescPtr shmdesc = (ShmDescPtr) value; ShmDescPtr shmdesc = (ShmDescPtr) value;
@ -729,12 +729,12 @@ ProcPanoramiXShmPutImage(ClientPtr client)
REQUEST(xShmPutImageReq); REQUEST(xShmPutImageReq);
REQUEST_SIZE_MATCH(xShmPutImageReq); REQUEST_SIZE_MATCH(xShmPutImageReq);
result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success) if (result != Success)
return (result == BadValue) ? BadDrawable : result; return (result == BadValue) ? BadDrawable : result;
result = dixLookupResourceByType((pointer *) &gc, stuff->gc, result = dixLookupResourceByType((void **) &gc, stuff->gc,
XRT_GC, client, DixReadAccess); XRT_GC, client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -783,7 +783,7 @@ ProcPanoramiXShmGetImage(ClientPtr client)
return BadValue; return BadValue;
} }
rc = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, rc = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (rc != Success) if (rc != Success)
return (rc == BadValue) ? BadDrawable : rc; return (rc == BadValue) ? BadDrawable : rc;
@ -980,7 +980,7 @@ ProcPanoramiXShmCreatePixmap(ClientPtr client)
shmdesc->refcnt++; shmdesc->refcnt++;
pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pMap->drawable.id = newPix->info[j].id; pMap->drawable.id = newPix->info[j].id;
if (!AddResource(newPix->info[j].id, RT_PIXMAP, (pointer) pMap)) { if (!AddResource(newPix->info[j].id, RT_PIXMAP, (void *) pMap)) {
result = BadAlloc; result = BadAlloc;
break; break;
} }
@ -1016,7 +1016,7 @@ fbShmCreatePixmap(ScreenPtr pScreen,
if (!(*pScreen->ModifyPixmapHeader) (pPixmap, width, height, depth, if (!(*pScreen->ModifyPixmapHeader) (pPixmap, width, height, depth,
BitsPerPixel(depth), BitsPerPixel(depth),
PixmapBytePad(width, depth), PixmapBytePad(width, depth),
(pointer) addr)) { (void *) addr)) {
(*pScreen->DestroyPixmap) (pPixmap); (*pScreen->DestroyPixmap) (pPixmap);
return NullPixmap; return NullPixmap;
} }
@ -1095,7 +1095,7 @@ ProcShmCreatePixmap(ClientPtr client)
shmdesc->refcnt++; shmdesc->refcnt++;
pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pMap->drawable.id = stuff->pid; pMap->drawable.id = stuff->pid;
if (AddResource(stuff->pid, RT_PIXMAP, (pointer) pMap)) { if (AddResource(stuff->pid, RT_PIXMAP, (void *) pMap)) {
return Success; return Success;
} }
} }
@ -1172,7 +1172,7 @@ ProcShmAttachFd(ClientPtr client)
shmdesc->next = Shmsegs; shmdesc->next = Shmsegs;
Shmsegs = shmdesc; Shmsegs = shmdesc;
if (!AddResource(stuff->shmseg, ShmSegType, (pointer) shmdesc)) if (!AddResource(stuff->shmseg, ShmSegType, (void *) shmdesc))
return BadAlloc; return BadAlloc;
return Success; return Success;
} }
@ -1263,7 +1263,7 @@ ProcShmCreateSegment(ClientPtr client)
shmdesc->next = Shmsegs; shmdesc->next = Shmsegs;
Shmsegs = shmdesc; Shmsegs = shmdesc;
if (!AddResource(stuff->shmseg, ShmSegType, (pointer) shmdesc)) { if (!AddResource(stuff->shmseg, ShmSegType, (void *) shmdesc)) {
close(fd); close(fd);
return BadAlloc; return BadAlloc;
} }

36
Xext/sleepuntil.c
View File

@ -46,10 +46,10 @@ typedef struct _Sertafied {
ClientPtr pClient; ClientPtr pClient;
XID id; XID id;
void (*notifyFunc) (ClientPtr /* client */ , void (*notifyFunc) (ClientPtr /* client */ ,
pointer /* closure */ void * /* closure */
); );
pointer closure; void *closure;
} SertafiedRec, *SertafiedPtr; } SertafiedRec, *SertafiedPtr;
static SertafiedPtr pPending; static SertafiedPtr pPending;
@ -58,24 +58,24 @@ static Bool BlockHandlerRegistered;
static int SertafiedGeneration; static int SertafiedGeneration;
static void ClientAwaken(ClientPtr /* client */ , static void ClientAwaken(ClientPtr /* client */ ,
pointer /* closure */ void * /* closure */
); );
static int SertafiedDelete(pointer /* value */ , static int SertafiedDelete(void * /* value */ ,
XID /* id */ XID /* id */
); );
static void SertafiedBlockHandler(pointer /* data */ , static void SertafiedBlockHandler(void * /* data */ ,
OSTimePtr /* wt */ , OSTimePtr /* wt */ ,
pointer /* LastSelectMask */ void * /* LastSelectMask */
); );
static void SertafiedWakeupHandler(pointer /* data */ , static void SertafiedWakeupHandler(void * /* data */ ,
int /* i */ , int /* i */ ,
pointer /* LastSelectMask */ void * /* LastSelectMask */
); );
int int
ClientSleepUntil(ClientPtr client, ClientSleepUntil(ClientPtr client,
TimeStamp *revive, TimeStamp *revive,
void (*notifyFunc) (ClientPtr, pointer), pointer closure) void (*notifyFunc) (ClientPtr, void *), void *closure)
{ {
SertafiedPtr pRequest, pReq, pPrev; SertafiedPtr pRequest, pReq, pPrev;
@ -97,14 +97,14 @@ ClientSleepUntil(ClientPtr client,
if (!BlockHandlerRegistered) { if (!BlockHandlerRegistered) {
if (!RegisterBlockAndWakeupHandlers(SertafiedBlockHandler, if (!RegisterBlockAndWakeupHandlers(SertafiedBlockHandler,
SertafiedWakeupHandler, SertafiedWakeupHandler,
(pointer) 0)) { (void *) 0)) {
free(pRequest); free(pRequest);
return FALSE; return FALSE;
} }
BlockHandlerRegistered = TRUE; BlockHandlerRegistered = TRUE;
} }
pRequest->notifyFunc = 0; pRequest->notifyFunc = 0;
if (!AddResource(pRequest->id, SertafiedResType, (pointer) pRequest)) if (!AddResource(pRequest->id, SertafiedResType, (void *) pRequest))
return FALSE; return FALSE;
if (!notifyFunc) if (!notifyFunc)
notifyFunc = ClientAwaken; notifyFunc = ClientAwaken;
@ -126,14 +126,14 @@ ClientSleepUntil(ClientPtr client,
} }
static void static void
ClientAwaken(ClientPtr client, pointer closure) ClientAwaken(ClientPtr client, void *closure)
{ {
if (!client->clientGone) if (!client->clientGone)
AttendClient(client); AttendClient(client);
} }
static int static int
SertafiedDelete(pointer value, XID id) SertafiedDelete(void *value, XID id)
{ {
SertafiedPtr pRequest = (SertafiedPtr) value; SertafiedPtr pRequest = (SertafiedPtr) value;
SertafiedPtr pReq, pPrev; SertafiedPtr pReq, pPrev;
@ -154,7 +154,7 @@ SertafiedDelete(pointer value, XID id)
} }
static void static void
SertafiedBlockHandler(pointer data, OSTimePtr wt, pointer LastSelectMask) SertafiedBlockHandler(void *data, OSTimePtr wt, void *LastSelectMask)
{ {
SertafiedPtr pReq, pNext; SertafiedPtr pReq, pNext;
unsigned long delay; unsigned long delay;
@ -186,7 +186,7 @@ SertafiedBlockHandler(pointer data, OSTimePtr wt, pointer LastSelectMask)
} }
static void static void
SertafiedWakeupHandler(pointer data, int i, pointer LastSelectMask) SertafiedWakeupHandler(void *data, int i, void *LastSelectMask)
{ {
SertafiedPtr pReq, pNext; SertafiedPtr pReq, pNext;
TimeStamp now; TimeStamp now;
@ -203,7 +203,7 @@ SertafiedWakeupHandler(pointer data, int i, pointer LastSelectMask)
} }
if (!pPending) { if (!pPending) {
RemoveBlockAndWakeupHandlers(SertafiedBlockHandler, RemoveBlockAndWakeupHandlers(SertafiedBlockHandler,
SertafiedWakeupHandler, (pointer) 0); SertafiedWakeupHandler, (void *) 0);
BlockHandlerRegistered = FALSE; BlockHandlerRegistered = FALSE;
} }
} }

4
Xext/sleepuntil.h
View File

@ -36,7 +36,7 @@
extern int ClientSleepUntil(ClientPtr client, extern int ClientSleepUntil(ClientPtr client,
TimeStamp *revive, TimeStamp *revive,
void (*notifyFunc) (ClientPtr /* client */ , void (*notifyFunc) (ClientPtr /* client */ ,
pointer /* closure */ void * /* closure */
), pointer Closure); ), void *Closure);
#endif #endif

50
Xext/sync.c
View File

@ -324,7 +324,7 @@ SyncInitTrigger(ClientPtr client, SyncTrigger * pTrigger, XID syncObject,
if (changes & XSyncCACounter) { if (changes & XSyncCACounter) {
if (syncObject == None) if (syncObject == None)
pSync = NULL; pSync = NULL;
else if (Success != (rc = dixLookupResourceByType((pointer *) &pSync, else if (Success != (rc = dixLookupResourceByType((void **) &pSync,
syncObject, resType, syncObject, resType,
client, client,
DixReadAccess))) { DixReadAccess))) {
@ -344,7 +344,7 @@ SyncInitTrigger(ClientPtr client, SyncTrigger * pTrigger, XID syncObject,
pCounter = (SyncCounter *) pSync; pCounter = (SyncCounter *) pSync;
if (IsSystemCounter(pCounter)) { if (IsSystemCounter(pCounter)) {
(*pCounter->pSysCounterInfo->QueryValue) ((pointer) pCounter, (*pCounter->pSysCounterInfo->QueryValue) ((void *) pCounter,
&pCounter->value); &pCounter->value);
} }
} }
@ -933,7 +933,7 @@ SyncCreateFenceFromFD(ClientPtr client, DrawablePtr pDraw, XID id, int fd, BOOL
return status; return status;
} }
if (!AddResource(id, RTFence, (pointer) pFence)) if (!AddResource(id, RTFence, (void *) pFence))
return BadAlloc; return BadAlloc;
return Success; return Success;
@ -963,7 +963,7 @@ SyncCreateCounter(ClientPtr client, XSyncCounter id, CARD64 initialvalue)
pCounter->value = initialvalue; pCounter->value = initialvalue;
pCounter->pSysCounterInfo = NULL; pCounter->pSysCounterInfo = NULL;
if (!AddResource(id, RTCounter, (pointer) pCounter)) if (!AddResource(id, RTCounter, (void *) pCounter))
return NULL; return NULL;
return pCounter; return pCounter;
@ -1023,7 +1023,7 @@ SyncCreateSystemCounter(const char *name,
} }
void void
SyncDestroySystemCounter(pointer pSysCounter) SyncDestroySystemCounter(void *pSysCounter)
{ {
SyncCounter *pCounter = (SyncCounter *) pSysCounter; SyncCounter *pCounter = (SyncCounter *) pSysCounter;
@ -1121,7 +1121,7 @@ SyncComputeBracketValues(SyncCounter * pCounter)
} }
} /* end for each trigger */ } /* end for each trigger */
(*psci->BracketValues) ((pointer) pCounter, pnewltval, pnewgtval); (*psci->BracketValues) ((void *) pCounter, pnewltval, pnewgtval);
} }
@ -1431,7 +1431,7 @@ ProcSyncSetCounter(ClientPtr client)
REQUEST_SIZE_MATCH(xSyncSetCounterReq); REQUEST_SIZE_MATCH(xSyncSetCounterReq);
rc = dixLookupResourceByType((pointer *) &pCounter, stuff->cid, RTCounter, rc = dixLookupResourceByType((void **) &pCounter, stuff->cid, RTCounter,
client, DixWriteAccess); client, DixWriteAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
@ -1460,7 +1460,7 @@ ProcSyncChangeCounter(ClientPtr client)
REQUEST_SIZE_MATCH(xSyncChangeCounterReq); REQUEST_SIZE_MATCH(xSyncChangeCounterReq);
rc = dixLookupResourceByType((pointer *) &pCounter, stuff->cid, RTCounter, rc = dixLookupResourceByType((void **) &pCounter, stuff->cid, RTCounter,
client, DixWriteAccess); client, DixWriteAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
@ -1493,7 +1493,7 @@ ProcSyncDestroyCounter(ClientPtr client)
REQUEST_SIZE_MATCH(xSyncDestroyCounterReq); REQUEST_SIZE_MATCH(xSyncDestroyCounterReq);
rc = dixLookupResourceByType((pointer *) &pCounter, stuff->counter, rc = dixLookupResourceByType((void **) &pCounter, stuff->counter,
RTCounter, client, DixDestroyAccess); RTCounter, client, DixDestroyAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
@ -1654,14 +1654,14 @@ ProcSyncQueryCounter(ClientPtr client)
REQUEST_SIZE_MATCH(xSyncQueryCounterReq); REQUEST_SIZE_MATCH(xSyncQueryCounterReq);
rc = dixLookupResourceByType((pointer *) &pCounter, stuff->counter, rc = dixLookupResourceByType((void **) &pCounter, stuff->counter,
RTCounter, client, DixReadAccess); RTCounter, client, DixReadAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
/* if system counter, ask it what the current value is */ /* if system counter, ask it what the current value is */
if (IsSystemCounter(pCounter)) { if (IsSystemCounter(pCounter)) {
(*pCounter->pSysCounterInfo->QueryValue) ((pointer) pCounter, (*pCounter->pSysCounterInfo->QueryValue) ((void *) pCounter,
&pCounter->value); &pCounter->value);
} }
@ -1780,7 +1780,7 @@ ProcSyncChangeAlarm(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xSyncChangeAlarmReq); REQUEST_AT_LEAST_SIZE(xSyncChangeAlarmReq);
status = dixLookupResourceByType((pointer *) &pAlarm, stuff->alarm, RTAlarm, status = dixLookupResourceByType((void **) &pAlarm, stuff->alarm, RTAlarm,
client, DixWriteAccess); client, DixWriteAccess);
if (status != Success) if (status != Success)
return status; return status;
@ -1821,7 +1821,7 @@ ProcSyncQueryAlarm(ClientPtr client)
REQUEST_SIZE_MATCH(xSyncQueryAlarmReq); REQUEST_SIZE_MATCH(xSyncQueryAlarmReq);
rc = dixLookupResourceByType((pointer *) &pAlarm, stuff->alarm, RTAlarm, rc = dixLookupResourceByType((void **) &pAlarm, stuff->alarm, RTAlarm,
client, DixReadAccess); client, DixReadAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
@ -1879,7 +1879,7 @@ ProcSyncDestroyAlarm(ClientPtr client)
REQUEST_SIZE_MATCH(xSyncDestroyAlarmReq); REQUEST_SIZE_MATCH(xSyncDestroyAlarmReq);
rc = dixLookupResourceByType((pointer *) &pAlarm, stuff->alarm, RTAlarm, rc = dixLookupResourceByType((void **) &pAlarm, stuff->alarm, RTAlarm,
client, DixDestroyAccess); client, DixDestroyAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
@ -1909,7 +1909,7 @@ ProcSyncCreateFence(ClientPtr client)
miSyncInitFence(pDraw->pScreen, pFence, stuff->initially_triggered); miSyncInitFence(pDraw->pScreen, pFence, stuff->initially_triggered);
if (!AddResource(stuff->fid, RTFence, (pointer) pFence)) if (!AddResource(stuff->fid, RTFence, (void *) pFence))
return BadAlloc; return BadAlloc;
return client->noClientException; return client->noClientException;
@ -1928,7 +1928,7 @@ FreeFence(void *obj, XID id)
int int
SyncVerifyFence(SyncFence ** ppSyncFence, XID fid, ClientPtr client, Mask mode) SyncVerifyFence(SyncFence ** ppSyncFence, XID fid, ClientPtr client, Mask mode)
{ {
int rc = dixLookupResourceByType((pointer *) ppSyncFence, fid, RTFence, int rc = dixLookupResourceByType((void **) ppSyncFence, fid, RTFence,
client, mode); client, mode);
if (rc != Success) if (rc != Success)
@ -1946,7 +1946,7 @@ ProcSyncTriggerFence(ClientPtr client)
REQUEST_SIZE_MATCH(xSyncTriggerFenceReq); REQUEST_SIZE_MATCH(xSyncTriggerFenceReq);
rc = dixLookupResourceByType((pointer *) &pFence, stuff->fid, RTFence, rc = dixLookupResourceByType((void **) &pFence, stuff->fid, RTFence,
client, DixWriteAccess); client, DixWriteAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
@ -1965,7 +1965,7 @@ ProcSyncResetFence(ClientPtr client)
REQUEST_SIZE_MATCH(xSyncResetFenceReq); REQUEST_SIZE_MATCH(xSyncResetFenceReq);
rc = dixLookupResourceByType((pointer *) &pFence, stuff->fid, RTFence, rc = dixLookupResourceByType((void **) &pFence, stuff->fid, RTFence,
client, DixWriteAccess); client, DixWriteAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
@ -1987,7 +1987,7 @@ ProcSyncDestroyFence(ClientPtr client)
REQUEST_SIZE_MATCH(xSyncDestroyFenceReq); REQUEST_SIZE_MATCH(xSyncDestroyFenceReq);
rc = dixLookupResourceByType((pointer *) &pFence, stuff->fid, RTFence, rc = dixLookupResourceByType((void **) &pFence, stuff->fid, RTFence,
client, DixDestroyAccess); client, DixDestroyAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
@ -2006,7 +2006,7 @@ ProcSyncQueryFence(ClientPtr client)
REQUEST_SIZE_MATCH(xSyncQueryFenceReq); REQUEST_SIZE_MATCH(xSyncQueryFenceReq);
rc = dixLookupResourceByType((pointer *) &pFence, stuff->fid, rc = dixLookupResourceByType((void **) &pFence, stuff->fid,
RTFence, client, DixReadAccess); RTFence, client, DixReadAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
@ -2555,7 +2555,7 @@ SyncExtensionInit(void)
* ***** SERVERTIME implementation - should go in its own file in OS directory? * ***** SERVERTIME implementation - should go in its own file in OS directory?
*/ */
static pointer ServertimeCounter; static void *ServertimeCounter;
static XSyncValue Now; static XSyncValue Now;
static XSyncValue *pnext_time; static XSyncValue *pnext_time;
@ -2656,7 +2656,7 @@ typedef struct {
} IdleCounterPriv; } IdleCounterPriv;
static void static void
IdleTimeQueryValue(pointer pCounter, CARD64 * pValue_return) IdleTimeQueryValue(void *pCounter, CARD64 * pValue_return)
{ {
int deviceid; int deviceid;
CARD32 idle; CARD32 idle;
@ -2673,7 +2673,7 @@ IdleTimeQueryValue(pointer pCounter, CARD64 * pValue_return)
} }
static void static void
IdleTimeBlockHandler(pointer pCounter, struct timeval **wt, pointer LastSelectMask) IdleTimeBlockHandler(void *pCounter, struct timeval **wt, void *LastSelectMask)
{ {
SyncCounter *counter = pCounter; SyncCounter *counter = pCounter;
IdleCounterPriv *priv = SysCounterGetPrivate(counter); IdleCounterPriv *priv = SysCounterGetPrivate(counter);
@ -2769,7 +2769,7 @@ IdleTimeCheckBrackets(SyncCounter *counter, XSyncValue idle, XSyncValue *less, X
} }
static void static void
IdleTimeWakeupHandler(pointer pCounter, int rc, pointer LastSelectMask) IdleTimeWakeupHandler(void *pCounter, int rc, void *LastSelectMask)
{ {
SyncCounter *counter = pCounter; SyncCounter *counter = pCounter;
IdleCounterPriv *priv = SysCounterGetPrivate(counter); IdleCounterPriv *priv = SysCounterGetPrivate(counter);
@ -2803,7 +2803,7 @@ IdleTimeWakeupHandler(pointer pCounter, int rc, pointer LastSelectMask)
} }
static void static void
IdleTimeBracketValues(pointer pCounter, CARD64 * pbracket_less, IdleTimeBracketValues(void *pCounter, CARD64 * pbracket_less,
CARD64 * pbracket_greater) CARD64 * pbracket_greater)
{ {
SyncCounter *counter = pCounter; SyncCounter *counter = pCounter;

6
Xext/syncsrv.h
View File

@ -66,10 +66,10 @@ typedef enum {
XSyncCounterUnrestricted XSyncCounterUnrestricted
} SyncCounterType; } SyncCounterType;
typedef void (*SyncSystemCounterQueryValue)(pointer counter, typedef void (*SyncSystemCounterQueryValue)(void *counter,
CARD64 *value_return CARD64 *value_return
); );
typedef void (*SyncSystemCounterBracketValues)(pointer counter, typedef void (*SyncSystemCounterBracketValues)(void *counter,
CARD64 *pbracket_less, CARD64 *pbracket_less,
CARD64 *pbracket_greater CARD64 *pbracket_greater
); );
@ -132,7 +132,7 @@ extern void SyncChangeCounter(SyncCounter *pCounter,
CARD64 new_value CARD64 new_value
); );
extern void SyncDestroySystemCounter(pointer pCounter); extern void SyncDestroySystemCounter(void *pCounter);
extern SyncCounter *SyncInitDeviceIdleTime(DeviceIntPtr dev); extern SyncCounter *SyncInitDeviceIdleTime(DeviceIntPtr dev);
extern void SyncRemoveDeviceIdleTime(SyncCounter *counter); extern void SyncRemoveDeviceIdleTime(SyncCounter *counter);

6
Xext/xace.c
View File

@ -122,9 +122,9 @@ XaceHook(int hook, ...)
u.res.client = va_arg(ap, ClientPtr); u.res.client = va_arg(ap, ClientPtr);
u.res.id = va_arg(ap, XID); u.res.id = va_arg(ap, XID);
u.res.rtype = va_arg(ap, RESTYPE); u.res.rtype = va_arg(ap, RESTYPE);
u.res.res = va_arg(ap, pointer); u.res.res = va_arg(ap, void *);
u.res.ptype = va_arg(ap, RESTYPE); u.res.ptype = va_arg(ap, RESTYPE);
u.res.parent = va_arg(ap, pointer); u.res.parent = va_arg(ap, void *);
u.res.access_mode = va_arg(ap, Mask); u.res.access_mode = va_arg(ap, Mask);
u.res.status = Success; /* default allow */ u.res.status = Success; /* default allow */
@ -288,7 +288,7 @@ XaceCensorImage(ClientPtr client,
pPix = GetScratchPixmapHeader(pDraw->pScreen, w, h, pPix = GetScratchPixmapHeader(pDraw->pScreen, w, h,
depth, bitsPerPixel, depth, bitsPerPixel,
widthBytesLine, (pointer) pBuf); widthBytesLine, (void *) pBuf);
if (!pPix) { if (!pPix) {
failed = TRUE; failed = TRUE;
goto failSafe; goto failSafe;

4
Xext/xacestr.h
View File

@ -40,9 +40,9 @@ typedef struct {
ClientPtr client; ClientPtr client;
XID id; XID id;
RESTYPE rtype; RESTYPE rtype;
pointer res; void *res;
RESTYPE ptype; RESTYPE ptype;
pointer parent; void *parent;
Mask access_mode; Mask access_mode;
int status; int status;
} XaceResourceAccessRec; } XaceResourceAccessRec;

34
Xext/xres.c
View File

@ -267,7 +267,7 @@ ProcXResQueryClients(ClientPtr client)
} }
static void static void
ResFindAllRes(pointer value, XID id, RESTYPE type, pointer cdata) ResFindAllRes(void *value, XID id, RESTYPE type, void *cdata)
{ {
int *counts = (int *) cdata; int *counts = (int *) cdata;
@ -365,7 +365,7 @@ ResGetApproxPixmapBytes(PixmapPtr pix)
} }
static void static void
ResFindResourcePixmaps(pointer value, XID id, RESTYPE type, pointer cdata) ResFindResourcePixmaps(void *value, XID id, RESTYPE type, void *cdata)
{ {
SizeType sizeFunc = GetResourceTypeSizeFunc(type); SizeType sizeFunc = GetResourceTypeSizeFunc(type);
ResourceSizeRec size = { 0, 0, 0 }; ResourceSizeRec size = { 0, 0, 0 };
@ -376,7 +376,7 @@ ResFindResourcePixmaps(pointer value, XID id, RESTYPE type, pointer cdata)
} }
static void static void
ResFindPixmaps(pointer value, XID id, pointer cdata) ResFindPixmaps(void *value, XID id, void *cdata)
{ {
unsigned long *bytes = (unsigned long *) cdata; unsigned long *bytes = (unsigned long *) cdata;
PixmapPtr pix = (PixmapPtr) value; PixmapPtr pix = (PixmapPtr) value;
@ -385,7 +385,7 @@ ResFindPixmaps(pointer value, XID id, pointer cdata)
} }
static void static void
ResFindWindowPixmaps(pointer value, XID id, pointer cdata) ResFindWindowPixmaps(void *value, XID id, void *cdata)
{ {
unsigned long *bytes = (unsigned long *) cdata; unsigned long *bytes = (unsigned long *) cdata;
WindowPtr pWin = (WindowPtr) value; WindowPtr pWin = (WindowPtr) value;
@ -398,7 +398,7 @@ ResFindWindowPixmaps(pointer value, XID id, pointer cdata)
} }
static void static void
ResFindGCPixmaps(pointer value, XID id, pointer cdata) ResFindGCPixmaps(void *value, XID id, void *cdata)
{ {
unsigned long *bytes = (unsigned long *) cdata; unsigned long *bytes = (unsigned long *) cdata;
GCPtr pGC = (GCPtr) value; GCPtr pGC = (GCPtr) value;
@ -411,7 +411,7 @@ ResFindGCPixmaps(pointer value, XID id, pointer cdata)
} }
static void static void
ResFindPicturePixmaps(pointer value, XID id, pointer cdata) ResFindPicturePixmaps(void *value, XID id, void *cdata)
{ {
#ifdef RENDER #ifdef RENDER
ResFindResourcePixmaps(value, id, PictureType, cdata); ResFindResourcePixmaps(value, id, PictureType, cdata);
@ -419,7 +419,7 @@ ResFindPicturePixmaps(pointer value, XID id, pointer cdata)
} }
static void static void
ResFindCompositeClientWindowPixmaps (pointer value, XID id, pointer cdata) ResFindCompositeClientWindowPixmaps (void *value, XID id, void *cdata)
{ {
#ifdef COMPOSITE #ifdef COMPOSITE
ResFindResourcePixmaps(value, id, CompositeClientWindowType, cdata); ResFindResourcePixmaps(value, id, CompositeClientWindowType, cdata);
@ -446,32 +446,32 @@ ProcXResQueryClientPixmapBytes(ClientPtr client)
bytes = 0; bytes = 0;
FindClientResourcesByType(clients[clientID], RT_PIXMAP, ResFindPixmaps, FindClientResourcesByType(clients[clientID], RT_PIXMAP, ResFindPixmaps,
(pointer) (&bytes)); (void *) (&bytes));
/* /*
* Make sure win background pixmaps also held to account. * Make sure win background pixmaps also held to account.
*/ */
FindClientResourcesByType(clients[clientID], RT_WINDOW, FindClientResourcesByType(clients[clientID], RT_WINDOW,
ResFindWindowPixmaps, (pointer) (&bytes)); ResFindWindowPixmaps, (void *) (&bytes));
/* /*
* GC Tile & Stipple pixmaps too. * GC Tile & Stipple pixmaps too.
*/ */
FindClientResourcesByType(clients[clientID], RT_GC, FindClientResourcesByType(clients[clientID], RT_GC,
ResFindGCPixmaps, (pointer) (&bytes)); ResFindGCPixmaps, (void *) (&bytes));
#ifdef RENDER #ifdef RENDER
/* Render extension picture pixmaps. */ /* Render extension picture pixmaps. */
FindClientResourcesByType(clients[clientID], PictureType, FindClientResourcesByType(clients[clientID], PictureType,
ResFindPicturePixmaps, ResFindPicturePixmaps,
(pointer)(&bytes)); (void *)(&bytes));
#endif #endif
#ifdef COMPOSITE #ifdef COMPOSITE
/* Composite extension client window pixmaps. */ /* Composite extension client window pixmaps. */
FindClientResourcesByType(clients[clientID], CompositeClientWindowType, FindClientResourcesByType(clients[clientID], CompositeClientWindowType,
ResFindCompositeClientWindowPixmaps, ResFindCompositeClientWindowPixmaps,
(pointer)(&bytes)); (void *)(&bytes));
#endif #endif
rep = (xXResQueryClientPixmapBytesReply) { rep = (xXResQueryClientPixmapBytesReply) {
@ -753,10 +753,10 @@ SwapXResQueryResourceBytes(struct xorg_list *response)
FindRes FindRes
*/ */
static void static void
AddSubResourceSizeSpec(pointer value, AddSubResourceSizeSpec(void *value,
XID id, XID id,
RESTYPE type, RESTYPE type,
pointer cdata) void *cdata)
{ {
ConstructResourceBytesCtx *ctx = cdata; ConstructResourceBytesCtx *ctx = cdata;
@ -818,7 +818,7 @@ AddSubResourceSizeSpec(pointer value,
FindRes FindRes
*/ */
static void static void
AddResourceSizeValue(pointer ptr, XID id, RESTYPE type, pointer cdata) AddResourceSizeValue(void *ptr, XID id, RESTYPE type, void *cdata)
{ {
ConstructResourceBytesCtx *ctx = cdata; ConstructResourceBytesCtx *ctx = cdata;
if (ctx->status == Success && if (ctx->status == Success &&
@ -888,7 +888,7 @@ AddResourceSizeValue(pointer ptr, XID id, RESTYPE type, pointer cdata)
@param[in/out] cdata The context object that contains the resource type @param[in/out] cdata The context object that contains the resource type
*/ */
static void static void
AddResourceSizeValueWithResType(pointer ptr, XID id, pointer cdata) AddResourceSizeValueWithResType(void *ptr, XID id, void *cdata)
{ {
ConstructResourceBytesCtx *ctx = cdata; ConstructResourceBytesCtx *ctx = cdata;
AddResourceSizeValue(ptr, id, ctx->resType, cdata); AddResourceSizeValue(ptr, id, ctx->resType, cdata);
@ -906,7 +906,7 @@ AddResourceSizeValueWithResType(pointer ptr, XID id, pointer cdata)
type FindAllRes type FindAllRes
*/ */
static void static void
AddResourceSizeValueByResource(pointer ptr, XID id, RESTYPE type, pointer cdata) AddResourceSizeValueByResource(void *ptr, XID id, RESTYPE type, void *cdata)
{ {
ConstructResourceBytesCtx *ctx = cdata; ConstructResourceBytesCtx *ctx = cdata;
xXResResourceIdSpec *spec = ctx->curSpec; xXResResourceIdSpec *spec = ctx->curSpec;

8
Xext/xselinux_ext.c
View File

@ -245,7 +245,7 @@ ProcSELinuxGetDrawableContext(ClientPtr client)
} }
static int static int
ProcSELinuxGetPropertyContext(ClientPtr client, pointer privKey) ProcSELinuxGetPropertyContext(ClientPtr client, void *privKey)
{ {
WindowPtr pWin; WindowPtr pWin;
PropertyPtr pProp; PropertyPtr pProp;
@ -269,7 +269,7 @@ ProcSELinuxGetPropertyContext(ClientPtr client, pointer privKey)
} }
static int static int
ProcSELinuxGetSelectionContext(ClientPtr client, pointer privKey) ProcSELinuxGetSelectionContext(ClientPtr client, void *privKey)
{ {
Selection *pSel; Selection *pSel;
SELinuxObjectRec *obj; SELinuxObjectRec *obj;
@ -576,7 +576,7 @@ SProcSELinuxGetDrawableContext(ClientPtr client)
} }
static int static int
SProcSELinuxGetPropertyContext(ClientPtr client, pointer privKey) SProcSELinuxGetPropertyContext(ClientPtr client, void *privKey)
{ {
REQUEST(SELinuxGetPropertyContextReq); REQUEST(SELinuxGetPropertyContextReq);
@ -587,7 +587,7 @@ SProcSELinuxGetPropertyContext(ClientPtr client, pointer privKey)
} }
static int static int
SProcSELinuxGetSelectionContext(ClientPtr client, pointer privKey) SProcSELinuxGetSelectionContext(ClientPtr client, void *privKey)
{ {
REQUEST(SELinuxGetContextReq); REQUEST(SELinuxGetContextReq);

32
Xext/xselinux_hooks.c
View File

@ -74,10 +74,10 @@ static Atom atom_client_ctx;
static security_id_t unlabeled_sid; static security_id_t unlabeled_sid;
/* forward declarations */ /* forward declarations */
static void SELinuxScreen(CallbackListPtr *, pointer, pointer); static void SELinuxScreen(CallbackListPtr *, void *, void *);
/* "true" pointer value for use as callback data */ /* "true" pointer value for use as callback data */
static pointer truep = (pointer) 1; static void *truep = (void *) 1;
/* /*
* Performs an SELinux permission check. * Performs an SELinux permission check.
@ -147,7 +147,7 @@ SELinuxLabelClient(ClientPtr client)
strncpy(subj->command, cmdname, COMMAND_LEN - 1); strncpy(subj->command, cmdname, COMMAND_LEN - 1);
if (!cached) if (!cached)
free((void *) cmdname); /* const char * */ free(cmdname); /* const char * */
} }
finish: finish:
@ -171,7 +171,7 @@ SELinuxLabelInitial(void)
SELinuxSubjectRec *subj; SELinuxSubjectRec *subj;
SELinuxObjectRec *obj; SELinuxObjectRec *obj;
security_context_t ctx; security_context_t ctx;
pointer unused; void *unused;
/* Do the serverClient */ /* Do the serverClient */
subj = dixLookupPrivate(&serverClient->devPrivates, subjectKey); subj = dixLookupPrivate(&serverClient->devPrivates, subjectKey);
@ -326,7 +326,7 @@ SELinuxLog(int type, const char *fmt, ...)
*/ */
static void static void
SELinuxDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata) SELinuxDevice(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
XaceDeviceAccessRec *rec = calldata; XaceDeviceAccessRec *rec = calldata;
SELinuxSubjectRec *subj; SELinuxSubjectRec *subj;
@ -363,7 +363,7 @@ SELinuxDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata)
} }
static void static void
SELinuxSend(CallbackListPtr *pcbl, pointer unused, pointer calldata) SELinuxSend(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
XaceSendAccessRec *rec = calldata; XaceSendAccessRec *rec = calldata;
SELinuxSubjectRec *subj; SELinuxSubjectRec *subj;
@ -405,7 +405,7 @@ SELinuxSend(CallbackListPtr *pcbl, pointer unused, pointer calldata)
} }
static void static void
SELinuxReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata) SELinuxReceive(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
XaceReceiveAccessRec *rec = calldata; XaceReceiveAccessRec *rec = calldata;
SELinuxSubjectRec *subj; SELinuxSubjectRec *subj;
@ -443,7 +443,7 @@ SELinuxReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata)
} }
static void static void
SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata) SELinuxExtension(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
XaceExtAccessRec *rec = calldata; XaceExtAccessRec *rec = calldata;
SELinuxSubjectRec *subj, *serv; SELinuxSubjectRec *subj, *serv;
@ -484,7 +484,7 @@ SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
} }
static void static void
SELinuxSelection(CallbackListPtr *pcbl, pointer unused, pointer calldata) SELinuxSelection(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
XaceSelectionAccessRec *rec = calldata; XaceSelectionAccessRec *rec = calldata;
SELinuxSubjectRec *subj; SELinuxSubjectRec *subj;
@ -544,7 +544,7 @@ SELinuxSelection(CallbackListPtr *pcbl, pointer unused, pointer calldata)
} }
static void static void
SELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata) SELinuxProperty(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
XacePropertyAccessRec *rec = calldata; XacePropertyAccessRec *rec = calldata;
SELinuxSubjectRec *subj; SELinuxSubjectRec *subj;
@ -608,7 +608,7 @@ SELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
} }
static void static void
SELinuxResource(CallbackListPtr *pcbl, pointer unused, pointer calldata) SELinuxResource(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
XaceResourceAccessRec *rec = calldata; XaceResourceAccessRec *rec = calldata;
SELinuxSubjectRec *subj; SELinuxSubjectRec *subj;
@ -667,7 +667,7 @@ SELinuxResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
} }
static void static void
SELinuxScreen(CallbackListPtr *pcbl, pointer is_saver, pointer calldata) SELinuxScreen(CallbackListPtr *pcbl, void *is_saver, void *calldata)
{ {
XaceScreenAccessRec *rec = calldata; XaceScreenAccessRec *rec = calldata;
SELinuxSubjectRec *subj; SELinuxSubjectRec *subj;
@ -699,7 +699,7 @@ SELinuxScreen(CallbackListPtr *pcbl, pointer is_saver, pointer calldata)
} }
static void static void
SELinuxClient(CallbackListPtr *pcbl, pointer unused, pointer calldata) SELinuxClient(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
XaceClientAccessRec *rec = calldata; XaceClientAccessRec *rec = calldata;
SELinuxSubjectRec *subj; SELinuxSubjectRec *subj;
@ -717,7 +717,7 @@ SELinuxClient(CallbackListPtr *pcbl, pointer unused, pointer calldata)
} }
static void static void
SELinuxServer(CallbackListPtr *pcbl, pointer unused, pointer calldata) SELinuxServer(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
XaceServerAccessRec *rec = calldata; XaceServerAccessRec *rec = calldata;
SELinuxSubjectRec *subj; SELinuxSubjectRec *subj;
@ -739,7 +739,7 @@ SELinuxServer(CallbackListPtr *pcbl, pointer unused, pointer calldata)
*/ */
static void static void
SELinuxClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata) SELinuxClientState(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
NewClientInfoRec *pci = calldata; NewClientInfoRec *pci = calldata;
@ -754,7 +754,7 @@ SELinuxClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
} }
static void static void
SELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata) SELinuxResourceState(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
ResourceStateInfoRec *rec = calldata; ResourceStateInfoRec *rec = calldata;
SELinuxSubjectRec *subj; SELinuxSubjectRec *subj;

2
Xext/xtest.c
View File

@ -127,7 +127,7 @@ ProcXTestCompareCursor(ClientPtr client)
else if (stuff->cursor == XTestCurrentCursor) else if (stuff->cursor == XTestCurrentCursor)
pCursor = GetSpriteCursor(ptr); pCursor = GetSpriteCursor(ptr);
else { else {
rc = dixLookupResourceByType((pointer *) &pCursor, stuff->cursor, rc = dixLookupResourceByType((void **) &pCursor, stuff->cursor,
RT_CURSOR, client, DixReadAccess); RT_CURSOR, client, DixReadAccess);
if (rc != Success) { if (rc != Success) {
client->errorValue = stuff->cursor; client->errorValue = stuff->cursor;

32
Xext/xvdisp.c
View File

@ -994,7 +994,7 @@ ProcXvShmPutImage(ClientPtr client)
if (!pImage) if (!pImage)
return BadMatch; return BadMatch;
status = dixLookupResourceByType((pointer *) &shmdesc, stuff->shmseg, status = dixLookupResourceByType((void **) &shmdesc, stuff->shmseg,
ShmSegType, serverClient, DixReadAccess); ShmSegType, serverClient, DixReadAccess);
if (status != Success) if (status != Success)
return status; return status;
@ -1512,12 +1512,12 @@ XineramaXvStopVideo(ClientPtr client)
REQUEST(xvStopVideoReq); REQUEST(xvStopVideoReq);
REQUEST_SIZE_MATCH(xvStopVideoReq); REQUEST_SIZE_MATCH(xvStopVideoReq);
result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success) if (result != Success)
return (result == BadValue) ? BadDrawable : result; return (result == BadValue) ? BadDrawable : result;
result = dixLookupResourceByType((pointer *) &port, stuff->port, result = dixLookupResourceByType((void **) &port, stuff->port,
XvXRTPort, client, DixReadAccess); XvXRTPort, client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -1542,7 +1542,7 @@ XineramaXvSetPortAttribute(ClientPtr client)
REQUEST_SIZE_MATCH(xvSetPortAttributeReq); REQUEST_SIZE_MATCH(xvSetPortAttributeReq);
result = dixLookupResourceByType((pointer *) &port, stuff->port, result = dixLookupResourceByType((void **) &port, stuff->port,
XvXRTPort, client, DixReadAccess); XvXRTPort, client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -1568,17 +1568,17 @@ XineramaXvShmPutImage(ClientPtr client)
REQUEST_SIZE_MATCH(xvShmPutImageReq); REQUEST_SIZE_MATCH(xvShmPutImageReq);
result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success) if (result != Success)
return (result == BadValue) ? BadDrawable : result; return (result == BadValue) ? BadDrawable : result;
result = dixLookupResourceByType((pointer *) &gc, stuff->gc, result = dixLookupResourceByType((void **) &gc, stuff->gc,
XRT_GC, client, DixReadAccess); XRT_GC, client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
result = dixLookupResourceByType((pointer *) &port, stuff->port, result = dixLookupResourceByType((void **) &port, stuff->port,
XvXRTPort, client, DixReadAccess); XvXRTPort, client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -1620,17 +1620,17 @@ XineramaXvPutImage(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xvPutImageReq); REQUEST_AT_LEAST_SIZE(xvPutImageReq);
result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success) if (result != Success)
return (result == BadValue) ? BadDrawable : result; return (result == BadValue) ? BadDrawable : result;
result = dixLookupResourceByType((pointer *) &gc, stuff->gc, result = dixLookupResourceByType((void **) &gc, stuff->gc,
XRT_GC, client, DixReadAccess); XRT_GC, client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
result = dixLookupResourceByType((pointer *) &port, stuff->port, result = dixLookupResourceByType((void **) &port, stuff->port,
XvXRTPort, client, DixReadAccess); XvXRTPort, client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -1668,17 +1668,17 @@ XineramaXvPutVideo(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xvPutVideoReq); REQUEST_AT_LEAST_SIZE(xvPutVideoReq);
result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success) if (result != Success)
return (result == BadValue) ? BadDrawable : result; return (result == BadValue) ? BadDrawable : result;
result = dixLookupResourceByType((pointer *) &gc, stuff->gc, result = dixLookupResourceByType((void **) &gc, stuff->gc,
XRT_GC, client, DixReadAccess); XRT_GC, client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
result = dixLookupResourceByType((pointer *) &port, stuff->port, result = dixLookupResourceByType((void **) &port, stuff->port,
XvXRTPort, client, DixReadAccess); XvXRTPort, client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -1716,17 +1716,17 @@ XineramaXvPutStill(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xvPutImageReq); REQUEST_AT_LEAST_SIZE(xvPutImageReq);
result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success) if (result != Success)
return (result == BadValue) ? BadDrawable : result; return (result == BadValue) ? BadDrawable : result;
result = dixLookupResourceByType((pointer *) &gc, stuff->gc, result = dixLookupResourceByType((void **) &gc, stuff->gc,
XRT_GC, client, DixReadAccess); XRT_GC, client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;
result = dixLookupResourceByType((pointer *) &port, stuff->port, result = dixLookupResourceByType((void **) &port, stuff->port,
XvXRTPort, client, DixReadAccess); XvXRTPort, client, DixReadAccess);
if (result != Success) if (result != Success)
return result; return result;

2
Xext/xvdix.h
View File

@ -200,7 +200,7 @@ typedef struct _XvPortRec {
#define VALIDATE_XV_PORT(portID, pPort, mode)\ #define VALIDATE_XV_PORT(portID, pPort, mode)\
{\ {\
int rc = dixLookupResourceByType((pointer *)&(pPort), portID,\ int rc = dixLookupResourceByType((void **)&(pPort), portID,\
XvRTPort, client, mode);\ XvRTPort, client, mode);\
if (rc != Success)\ if (rc != Success)\
return rc;\ return rc;\

28
Xext/xvmain.c
View File

@ -134,12 +134,12 @@ static Bool XvCloseScreen(ScreenPtr);
static Bool XvDestroyPixmap(PixmapPtr); static Bool XvDestroyPixmap(PixmapPtr);
static Bool XvDestroyWindow(WindowPtr); static Bool XvDestroyWindow(WindowPtr);
static void XvResetProc(ExtensionEntry *); static void XvResetProc(ExtensionEntry *);
static int XvdiDestroyGrab(pointer, XID); static int XvdiDestroyGrab(void *, XID);
static int XvdiDestroyEncoding(pointer, XID); static int XvdiDestroyEncoding(void *, XID);
static int XvdiDestroyVideoNotify(pointer, XID); static int XvdiDestroyVideoNotify(void *, XID);
static int XvdiDestroyPortNotify(pointer, XID); static int XvdiDestroyPortNotify(void *, XID);
static int XvdiDestroyVideoNotifyList(pointer, XID); static int XvdiDestroyVideoNotifyList(void *, XID);
static int XvdiDestroyPort(pointer, XID); static int XvdiDestroyPort(void *, XID);
static int XvdiSendVideoNotify(XvPortPtr, DrawablePtr, int); static int XvdiSendVideoNotify(XvPortPtr, DrawablePtr, int);
/* /*
@ -450,20 +450,20 @@ XvdiVideoStopped(XvPortPtr pPort, int reason)
} }
static int static int
XvdiDestroyPort(pointer pPort, XID id) XvdiDestroyPort(void *pPort, XID id)
{ {
return (*((XvPortPtr) pPort)->pAdaptor->ddFreePort) (pPort); return (*((XvPortPtr) pPort)->pAdaptor->ddFreePort) (pPort);
} }
static int static int
XvdiDestroyGrab(pointer pGrab, XID id) XvdiDestroyGrab(void *pGrab, XID id)
{ {
((XvGrabPtr) pGrab)->client = NULL; ((XvGrabPtr) pGrab)->client = NULL;
return Success; return Success;
} }
static int static int
XvdiDestroyVideoNotify(pointer pn, XID id) XvdiDestroyVideoNotify(void *pn, XID id)
{ {
/* JUST CLEAR OUT THE client POINTER FIELD */ /* JUST CLEAR OUT THE client POINTER FIELD */
@ -472,7 +472,7 @@ XvdiDestroyVideoNotify(pointer pn, XID id)
} }
static int static int
XvdiDestroyPortNotify(pointer pn, XID id) XvdiDestroyPortNotify(void *pn, XID id)
{ {
/* JUST CLEAR OUT THE client POINTER FIELD */ /* JUST CLEAR OUT THE client POINTER FIELD */
@ -481,7 +481,7 @@ XvdiDestroyPortNotify(pointer pn, XID id)
} }
static int static int
XvdiDestroyVideoNotifyList(pointer pn, XID id) XvdiDestroyVideoNotifyList(void *pn, XID id)
{ {
XvVideoNotifyPtr npn, cpn; XvVideoNotifyPtr npn, cpn;
@ -500,7 +500,7 @@ XvdiDestroyVideoNotifyList(pointer pn, XID id)
} }
static int static int
XvdiDestroyEncoding(pointer value, XID id) XvdiDestroyEncoding(void *value, XID id)
{ {
return Success; return Success;
} }
@ -510,7 +510,7 @@ XvdiSendVideoNotify(XvPortPtr pPort, DrawablePtr pDraw, int reason)
{ {
XvVideoNotifyPtr pn; XvVideoNotifyPtr pn;
dixLookupResourceByType((pointer *) &pn, pDraw->id, XvRTVideoNotifyList, dixLookupResourceByType((void **) &pn, pDraw->id, XvRTVideoNotifyList,
serverClient, DixReadAccess); serverClient, DixReadAccess);
while (pn) { while (pn) {
@ -843,7 +843,7 @@ XvdiSelectVideoNotify(ClientPtr client, DrawablePtr pDraw, BOOL onoff)
/* FIND VideoNotify LIST */ /* FIND VideoNotify LIST */
rc = dixLookupResourceByType((pointer *) &pn, pDraw->id, rc = dixLookupResourceByType((void **) &pn, pDraw->id,
XvRTVideoNotifyList, client, DixWriteAccess); XvRTVideoNotifyList, client, DixWriteAccess);
if (rc != Success && rc != BadValue) if (rc != Success && rc != BadValue)
return rc; return rc;

20
Xext/xvmc.c
View File

@ -61,7 +61,7 @@ typedef struct {
(XvMCScreenPtr)(dixLookupPrivate(&(pScreen)->devPrivates, XvMCScreenKey)) (XvMCScreenPtr)(dixLookupPrivate(&(pScreen)->devPrivates, XvMCScreenKey))
static int static int
XvMCDestroyContextRes(pointer data, XID id) XvMCDestroyContextRes(void *data, XID id)
{ {
XvMCContextPtr pContext = (XvMCContextPtr) data; XvMCContextPtr pContext = (XvMCContextPtr) data;
@ -78,7 +78,7 @@ XvMCDestroyContextRes(pointer data, XID id)
} }
static int static int
XvMCDestroySurfaceRes(pointer data, XID id) XvMCDestroySurfaceRes(void *data, XID id)
{ {
XvMCSurfacePtr pSurface = (XvMCSurfacePtr) data; XvMCSurfacePtr pSurface = (XvMCSurfacePtr) data;
XvMCContextPtr pContext = pSurface->context; XvMCContextPtr pContext = pSurface->context;
@ -87,13 +87,13 @@ XvMCDestroySurfaceRes(pointer data, XID id)
(*pScreenPriv->adaptors[pContext->adapt_num].DestroySurface) (pSurface); (*pScreenPriv->adaptors[pContext->adapt_num].DestroySurface) (pSurface);
free(pSurface); free(pSurface);
XvMCDestroyContextRes((pointer) pContext, pContext->context_id); XvMCDestroyContextRes((void *) pContext, pContext->context_id);
return Success; return Success;
} }
static int static int
XvMCDestroySubpictureRes(pointer data, XID id) XvMCDestroySubpictureRes(void *data, XID id)
{ {
XvMCSubpicturePtr pSubpict = (XvMCSubpicturePtr) data; XvMCSubpicturePtr pSubpict = (XvMCSubpicturePtr) data;
XvMCContextPtr pContext = pSubpict->context; XvMCContextPtr pContext = pSubpict->context;
@ -102,7 +102,7 @@ XvMCDestroySubpictureRes(pointer data, XID id)
(*pScreenPriv->adaptors[pContext->adapt_num].DestroySubpicture) (pSubpict); (*pScreenPriv->adaptors[pContext->adapt_num].DestroySubpicture) (pSubpict);
free(pSubpict); free(pSubpict);
XvMCDestroyContextRes((pointer) pContext, pContext->context_id); XvMCDestroyContextRes((void *) pContext, pContext->context_id);
return Success; return Success;
} }
@ -276,7 +276,7 @@ ProcXvMCCreateContext(ClientPtr client)
static int static int
ProcXvMCDestroyContext(ClientPtr client) ProcXvMCDestroyContext(ClientPtr client)
{ {
pointer val; void *val;
int rc; int rc;
REQUEST(xvmcDestroyContextReq); REQUEST(xvmcDestroyContextReq);
@ -306,7 +306,7 @@ ProcXvMCCreateSurface(ClientPtr client)
REQUEST(xvmcCreateSurfaceReq); REQUEST(xvmcCreateSurfaceReq);
REQUEST_SIZE_MATCH(xvmcCreateSurfaceReq); REQUEST_SIZE_MATCH(xvmcCreateSurfaceReq);
result = dixLookupResourceByType((pointer *) &pContext, stuff->context_id, result = dixLookupResourceByType((void **) &pContext, stuff->context_id,
XvMCRTContext, client, DixUseAccess); XvMCRTContext, client, DixUseAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -350,7 +350,7 @@ ProcXvMCCreateSurface(ClientPtr client)
static int static int
ProcXvMCDestroySurface(ClientPtr client) ProcXvMCDestroySurface(ClientPtr client)
{ {
pointer val; void *val;
int rc; int rc;
REQUEST(xvmcDestroySurfaceReq); REQUEST(xvmcDestroySurfaceReq);
@ -382,7 +382,7 @@ ProcXvMCCreateSubpicture(ClientPtr client)
REQUEST(xvmcCreateSubpictureReq); REQUEST(xvmcCreateSubpictureReq);
REQUEST_SIZE_MATCH(xvmcCreateSubpictureReq); REQUEST_SIZE_MATCH(xvmcCreateSubpictureReq);
result = dixLookupResourceByType((pointer *) &pContext, stuff->context_id, result = dixLookupResourceByType((void **) &pContext, stuff->context_id,
XvMCRTContext, client, DixUseAccess); XvMCRTContext, client, DixUseAccess);
if (result != Success) if (result != Success)
return result; return result;
@ -474,7 +474,7 @@ ProcXvMCCreateSubpicture(ClientPtr client)
static int static int
ProcXvMCDestroySubpicture(ClientPtr client) ProcXvMCDestroySubpicture(ClientPtr client)
{ {
pointer val; void *val;
int rc; int rc;
REQUEST(xvmcDestroySubpictureReq); REQUEST(xvmcDestroySubpictureReq);

8
Xext/xvmcext.h
View File

@ -31,15 +31,15 @@ typedef struct {
unsigned short height; unsigned short height;
CARD32 flags; CARD32 flags;
int refcnt; int refcnt;
pointer port_priv; void *port_priv;
pointer driver_priv; void *driver_priv;
} XvMCContextRec, *XvMCContextPtr; } XvMCContextRec, *XvMCContextPtr;
typedef struct { typedef struct {
XID surface_id; XID surface_id;
int surface_type_id; int surface_type_id;
XvMCContextPtr context; XvMCContextPtr context;
pointer driver_priv; void *driver_priv;
} XvMCSurfaceRec, *XvMCSurfacePtr; } XvMCSurfaceRec, *XvMCSurfacePtr;
typedef struct { typedef struct {
@ -51,7 +51,7 @@ typedef struct {
int entry_bytes; int entry_bytes;
char component_order[4]; char component_order[4];
XvMCContextPtr context; XvMCContextPtr context;
pointer driver_priv; void *driver_priv;
} XvMCSubpictureRec, *XvMCSubpicturePtr; } XvMCSubpictureRec, *XvMCSubpicturePtr;
typedef int (*XvMCCreateContextProcPtr) (XvPortPtr port, typedef int (*XvMCCreateContextProcPtr) (XvPortPtr port,

6
Xi/devbell.c
View File

@ -91,7 +91,7 @@ ProcXDeviceBell(ClientPtr client)
int rc, base; int rc, base;
int newpercent; int newpercent;
CARD8 class; CARD8 class;
pointer ctrl; void *ctrl;
BellProcPtr proc; BellProcPtr proc;
REQUEST(xDeviceBellReq); REQUEST(xDeviceBellReq);
@ -117,7 +117,7 @@ ProcXDeviceBell(ClientPtr client)
} }
base = k->ctrl.bell; base = k->ctrl.bell;
proc = k->BellProc; proc = k->BellProc;
ctrl = (pointer) &(k->ctrl); ctrl = (void *) &(k->ctrl);
class = KbdFeedbackClass; class = KbdFeedbackClass;
} }
else if (stuff->feedbackclass == BellFeedbackClass) { else if (stuff->feedbackclass == BellFeedbackClass) {
@ -130,7 +130,7 @@ ProcXDeviceBell(ClientPtr client)
} }
base = b->ctrl.percent; base = b->ctrl.percent;
proc = b->BellProc; proc = b->BellProc;
ctrl = (pointer) &(b->ctrl); ctrl = (void *) &(b->ctrl);
class = BellFeedbackClass; class = BellFeedbackClass;
} }
else { else {

12
Xi/exevents.c
View File

@ -1302,7 +1302,7 @@ RetrieveTouchDeliveryData(DeviceIntPtr dev, TouchPointInfoPtr ti,
*mask = (*grab)->xi2mask; *mask = (*grab)->xi2mask;
} }
else { else {
rc = dixLookupResourceByType((pointer *) win, listener->listener, rc = dixLookupResourceByType((void **) win, listener->listener,
listener->resource_type, listener->resource_type,
serverClient, DixSendAccess); serverClient, DixSendAccess);
if (rc != Success) if (rc != Success)
@ -1735,7 +1735,7 @@ ProcessDeviceEvent(InternalEvent *ev, DeviceIntPtr device)
eventinfo.device = device; eventinfo.device = device;
eventinfo.event = ev; eventinfo.event = ev;
CallCallbacks(&DeviceEventCallback, (pointer) &eventinfo); CallCallbacks(&DeviceEventCallback, (void *) &eventinfo);
} }
grab = device->deviceGrab.grab; grab = device->deviceGrab.grab;
@ -2204,7 +2204,7 @@ GrabButton(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device,
if (param->cursor == None) if (param->cursor == None)
cursor = NullCursor; cursor = NullCursor;
else { else {
rc = dixLookupResourceByType((pointer *) &cursor, param->cursor, rc = dixLookupResourceByType((void **) &cursor, param->cursor,
RT_CURSOR, client, DixUseAccess); RT_CURSOR, client, DixUseAccess);
if (rc != Success) { if (rc != Success) {
client->errorValue = param->cursor; client->errorValue = param->cursor;
@ -2303,7 +2303,7 @@ GrabWindow(ClientPtr client, DeviceIntPtr dev, int type,
if (param->cursor == None) if (param->cursor == None)
cursor = NullCursor; cursor = NullCursor;
else { else {
rc = dixLookupResourceByType((pointer *) &cursor, param->cursor, rc = dixLookupResourceByType((void **) &cursor, param->cursor,
RT_CURSOR, client, DixUseAccess); RT_CURSOR, client, DixUseAccess);
if (rc != Success) { if (rc != Success) {
client->errorValue = param->cursor; client->errorValue = param->cursor;
@ -2446,7 +2446,7 @@ AddExtensionClient(WindowPtr pWin, ClientPtr client, Mask mask, int mskidx)
others->resource = FakeClientID(client->index); others->resource = FakeClientID(client->index);
others->next = pWin->optional->inputMasks->inputClients; others->next = pWin->optional->inputMasks->inputClients;
pWin->optional->inputMasks->inputClients = others; pWin->optional->inputMasks->inputClients = others;
if (!AddResource(others->resource, RT_INPUTCLIENT, (pointer) pWin)) if (!AddResource(others->resource, RT_INPUTCLIENT, (void *) pWin))
goto bail; goto bail;
return Success; return Success;
@ -2548,7 +2548,7 @@ InputClientGone(WindowPtr pWin, XID id)
else { else {
other->resource = FakeClientID(0); other->resource = FakeClientID(0);
if (!AddResource(other->resource, RT_INPUTCLIENT, if (!AddResource(other->resource, RT_INPUTCLIENT,
(pointer) pWin)) (void *) pWin))
return BadAlloc; return BadAlloc;
} }
} }

2
Xi/extinit.c
View File

@ -381,7 +381,7 @@ DevPrivateKeyRec XIClientPrivateKeyRec;
*/ */
static void static void
XIClientCallback(CallbackListPtr *list, pointer closure, pointer data) XIClientCallback(CallbackListPtr *list, void *closure, void *data)
{ {
NewClientInfoRec *clientinfo = (NewClientInfoRec *) data; NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
ClientPtr pClient = clientinfo->client; ClientPtr pClient = clientinfo->client;

4
Xi/xibarriers.c
View File

@ -695,7 +695,7 @@ BarrierFreeBarrier(void *data, XID id)
return Success; return Success;
} }
static void add_master_func(pointer res, XID id, pointer devid) static void add_master_func(void *res, XID id, void *devid)
{ {
struct PointerBarrier *b; struct PointerBarrier *b;
struct PointerBarrierClient *barrier; struct PointerBarrierClient *barrier;
@ -712,7 +712,7 @@ static void add_master_func(pointer res, XID id, pointer devid)
xorg_list_add(&pbd->entry, &barrier->per_device); xorg_list_add(&pbd->entry, &barrier->per_device);
} }
static void remove_master_func(pointer res, XID id, pointer devid) static void remove_master_func(void *res, XID id, void *devid)
{ {
struct PointerBarrierDevice *pbd; struct PointerBarrierDevice *pbd;
struct PointerBarrierClient *barrier; struct PointerBarrierClient *barrier;

2
Xi/xichangecursor.c
View File

@ -96,7 +96,7 @@ ProcXIChangeCursor(ClientPtr client)
pCursor = (CursorPtr) None; pCursor = (CursorPtr) None;
} }
else { else {
rc = dixLookupResourceByType((pointer *) &pCursor, stuff->cursor, rc = dixLookupResourceByType((void **) &pCursor, stuff->cursor,
RT_CURSOR, client, DixUseAccess); RT_CURSOR, client, DixUseAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;

8
Xi/xiproperty.c
View File

@ -723,10 +723,10 @@ XIChangeDeviceProperty(DeviceIntPtr dev, Atom property, Atom type,
total_len = prop_value->size + len; total_len = prop_value->size + len;
if (mode == PropModeReplace || len > 0) { if (mode == PropModeReplace || len > 0) {
pointer new_data = NULL, old_data = NULL; void *new_data = NULL, *old_data = NULL;
total_size = total_len * size_in_bytes; total_size = total_len * size_in_bytes;
new_value.data = (pointer) malloc(total_size); new_value.data = (void *) malloc(total_size);
if (!new_value.data && total_size) { if (!new_value.data && total_size) {
if (add) if (add)
XIDestroyDeviceProperty(prop); XIDestroyDeviceProperty(prop);
@ -742,13 +742,13 @@ XIChangeDeviceProperty(DeviceIntPtr dev, Atom property, Atom type,
old_data = NULL; old_data = NULL;
break; break;
case PropModeAppend: case PropModeAppend:
new_data = (pointer) (((char *) new_value.data) + new_data = (void *) (((char *) new_value.data) +
(prop_value->size * size_in_bytes)); (prop_value->size * size_in_bytes));
old_data = new_value.data; old_data = new_value.data;
break; break;
case PropModePrepend: case PropModePrepend:
new_data = new_value.data; new_data = new_value.data;
old_data = (pointer) (((char *) new_value.data) + old_data = (void *) (((char *) new_value.data) +
(prop_value->size * size_in_bytes)); (prop_value->size * size_in_bytes));
break; break;
} }

2
composite/compalloc.c
View File

@ -55,7 +55,7 @@ compScreenUpdate(ScreenPtr pScreen)
} }
static void static void
compBlockHandler(ScreenPtr pScreen, pointer pTimeout, pointer pReadmask) compBlockHandler(ScreenPtr pScreen, void *pTimeout, void *pReadmask)
{ {
CompScreenPtr cs = GetCompScreen(pScreen); CompScreenPtr cs = GetCompScreen(pScreen);

22
composite/compext.c
View File

@ -67,7 +67,7 @@ typedef struct _CompositeClient {
dixLookupPrivate(&(pClient)->devPrivates, CompositeClientPrivateKey)) dixLookupPrivate(&(pClient)->devPrivates, CompositeClientPrivateKey))
static void static void
CompositeClientCallback(CallbackListPtr *list, pointer closure, pointer data) CompositeClientCallback(CallbackListPtr *list, void *closure, void *data)
{ {
NewClientInfoRec *clientinfo = (NewClientInfoRec *) data; NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
ClientPtr pClient = clientinfo->client; ClientPtr pClient = clientinfo->client;
@ -78,7 +78,7 @@ CompositeClientCallback(CallbackListPtr *list, pointer closure, pointer data)
} }
static int static int
FreeCompositeClientWindow(pointer value, XID ccwid) FreeCompositeClientWindow(void *value, XID ccwid)
{ {
WindowPtr pWin = value; WindowPtr pWin = value;
@ -87,7 +87,7 @@ FreeCompositeClientWindow(pointer value, XID ccwid)
} }
static int static int
FreeCompositeClientSubwindows(pointer value, XID ccwid) FreeCompositeClientSubwindows(void *value, XID ccwid)
{ {
WindowPtr pWin = value; WindowPtr pWin = value;
@ -96,7 +96,7 @@ FreeCompositeClientSubwindows(pointer value, XID ccwid)
} }
static int static int
FreeCompositeClientOverlay(pointer value, XID ccwid) FreeCompositeClientOverlay(void *value, XID ccwid)
{ {
CompOverlayClientPtr pOc = (CompOverlayClientPtr) value; CompOverlayClientPtr pOc = (CompOverlayClientPtr) value;
@ -140,7 +140,7 @@ ProcCompositeQueryVersion(ClientPtr client)
#define VERIFY_WINDOW(pWindow, wid, client, mode) \ #define VERIFY_WINDOW(pWindow, wid, client, mode) \
do { \ do { \
int err; \ int err; \
err = dixLookupResourceByType((pointer *) &pWindow, wid, \ err = dixLookupResourceByType((void **) &pWindow, wid, \
RT_WINDOW, client, mode); \ RT_WINDOW, client, mode); \
if (err != Success) { \ if (err != Success) { \
client->errorValue = wid; \ client->errorValue = wid; \
@ -227,7 +227,7 @@ ProcCompositeCreateRegionFromBorderClip(ClientPtr client)
return BadAlloc; return BadAlloc;
RegionTranslate(pRegion, -pWin->drawable.x, -pWin->drawable.y); RegionTranslate(pRegion, -pWin->drawable.x, -pWin->drawable.y);
if (!AddResource(stuff->region, RegionResType, (pointer) pRegion)) if (!AddResource(stuff->region, RegionResType, (void *) pRegion))
return BadAlloc; return BadAlloc;
return Success; return Success;
@ -267,7 +267,7 @@ ProcCompositeNameWindowPixmap(ClientPtr client)
++pPixmap->refcnt; ++pPixmap->refcnt;
if (!AddResource(stuff->pixmap, RT_PIXMAP, (pointer) pPixmap)) if (!AddResource(stuff->pixmap, RT_PIXMAP, (void *) pPixmap))
return BadAlloc; return BadAlloc;
return Success; return Success;
@ -500,7 +500,7 @@ SProcCompositeDispatch(ClientPtr client)
/** @see GetDefaultBytes */ /** @see GetDefaultBytes */
static void static void
GetCompositeClientWindowBytes(pointer value, XID id, ResourceSizePtr size) GetCompositeClientWindowBytes(void *value, XID id, ResourceSizePtr size)
{ {
WindowPtr window = value; WindowPtr window = value;
@ -754,13 +754,13 @@ PanoramiXCompositeNameWindowPixmap(ClientPtr client)
return BadMatch; return BadMatch;
} }
if (!AddResource(newPix->info[i].id, RT_PIXMAP, (pointer) pPixmap)) if (!AddResource(newPix->info[i].id, RT_PIXMAP, (void *) pPixmap))
return BadAlloc; return BadAlloc;
++pPixmap->refcnt; ++pPixmap->refcnt;
} }
if (!AddResource(stuff->pixmap, XRT_PIXMAP, (pointer) newPix)) if (!AddResource(stuff->pixmap, XRT_PIXMAP, (void *) newPix))
return BadAlloc; return BadAlloc;
return Success; return Success;
@ -797,7 +797,7 @@ PanoramiXCompositeGetOverlayWindow(ClientPtr client)
} }
FOR_NSCREENS_BACKWARD(i) { FOR_NSCREENS_BACKWARD(i) {
rc = dixLookupResourceByType((pointer *) &pWin, win->info[i].id, rc = dixLookupResourceByType((void **) &pWin, win->info[i].id,
RT_WINDOW, client, DixGetAttrAccess); RT_WINDOW, client, DixGetAttrAccess);
if (rc != Success) { if (rc != Success) {
client->errorValue = stuff->window; client->errorValue = stuff->window;

2
composite/compinit.c
View File

@ -119,7 +119,7 @@ compChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
pScreen->backingStoreSupport != NotUseful) { pScreen->backingStoreSupport != NotUseful) {
if (pWin->backingStore != NotUseful && !pWin->backStorage) { if (pWin->backingStore != NotUseful && !pWin->backStorage) {
compRedirectWindow(serverClient, pWin, CompositeRedirectAutomatic); compRedirectWindow(serverClient, pWin, CompositeRedirectAutomatic);
pWin->backStorage = (pointer) (intptr_t) 1; pWin->backStorage = (void *) (intptr_t) 1;
} }
else if (pWin->backingStore == NotUseful && pWin->backStorage) { else if (pWin->backingStore == NotUseful && pWin->backStorage) {
compUnredirectWindow(serverClient, pWin, compUnredirectWindow(serverClient, pWin,

2
composite/compint.h
View File

@ -319,7 +319,7 @@ WindowPtr
CompositeRealChildHead(WindowPtr pWin); CompositeRealChildHead(WindowPtr pWin);
int int
DeleteWindowNoInputDevices(pointer value, XID wid); DeleteWindowNoInputDevices(void *value, XID wid);
int int

4
composite/compoverlay.c
View File

@ -114,7 +114,7 @@ compCreateOverlayClient(ScreenPtr pScreen, ClientPtr pClient)
* Create a resource for this element so it can be deleted * Create a resource for this element so it can be deleted
* when the client goes away. * when the client goes away.
*/ */
if (!AddResource(pOc->resource, CompositeClientOverlayType, (pointer) pOc)) if (!AddResource(pOc->resource, CompositeClientOverlayType, (void *) pOc))
return NULL; return NULL;
return pOc; return pOc;
@ -152,7 +152,7 @@ compCreateOverlayWindow(ScreenPtr pScreen)
if (pWin == NULL) if (pWin == NULL)
return FALSE; return FALSE;
if (!AddResource(pWin->drawable.id, RT_WINDOW, (pointer) pWin)) if (!AddResource(pWin->drawable.id, RT_WINDOW, (void *) pWin))
return FALSE; return FALSE;
MapWindow(pWin, serverClient); MapWindow(pWin, serverClient);

10
composite/compwindow.c
View File

@ -53,7 +53,7 @@
#ifdef COMPOSITE_DEBUG #ifdef COMPOSITE_DEBUG
static int static int
compCheckWindow(WindowPtr pWin, pointer data) compCheckWindow(WindowPtr pWin, void *data)
{ {
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
PixmapPtr pWinPixmap = (*pScreen->GetWindowPixmap) (pWin); PixmapPtr pWinPixmap = (*pScreen->GetWindowPixmap) (pWin);
@ -92,7 +92,7 @@ typedef struct _compPixmapVisit {
} CompPixmapVisitRec, *CompPixmapVisitPtr; } CompPixmapVisitRec, *CompPixmapVisitPtr;
static Bool static Bool
compRepaintBorder(ClientPtr pClient, pointer closure) compRepaintBorder(ClientPtr pClient, void *closure)
{ {
WindowPtr pWindow; WindowPtr pWindow;
int rc = int rc =
@ -111,7 +111,7 @@ compRepaintBorder(ClientPtr pClient, pointer closure)
} }
static int static int
compSetPixmapVisitWindow(WindowPtr pWindow, pointer data) compSetPixmapVisitWindow(WindowPtr pWindow, void *data)
{ {
CompPixmapVisitPtr pVisit = (CompPixmapVisitPtr) data; CompPixmapVisitPtr pVisit = (CompPixmapVisitPtr) data;
ScreenPtr pScreen = pWindow->drawable.pScreen; ScreenPtr pScreen = pWindow->drawable.pScreen;
@ -128,7 +128,7 @@ compSetPixmapVisitWindow(WindowPtr pWindow, pointer data)
SetBorderSize(pWindow); SetBorderSize(pWindow);
if (HasBorder(pWindow)) if (HasBorder(pWindow))
QueueWorkProc(compRepaintBorder, serverClient, QueueWorkProc(compRepaintBorder, serverClient,
(pointer) (intptr_t) pWindow->drawable.id); (void *) (intptr_t) pWindow->drawable.id);
return WT_WALKCHILDREN; return WT_WALKCHILDREN;
} }
@ -139,7 +139,7 @@ compSetPixmap(WindowPtr pWindow, PixmapPtr pPixmap)
visitRec.pWindow = pWindow; visitRec.pWindow = pWindow;
visitRec.pPixmap = pPixmap; visitRec.pPixmap = pPixmap;
TraverseTree(pWindow, compSetPixmapVisitWindow, (pointer) &visitRec); TraverseTree(pWindow, compSetPixmapVisitWindow, (void *) &visitRec);
compCheckTree(pWindow->drawable.pScreen); compCheckTree(pWindow->drawable.pScreen);
} }

8
config/dbus-core.c
View File

@ -45,10 +45,10 @@ struct dbus_core_info {
}; };
static struct dbus_core_info bus_info; static struct dbus_core_info bus_info;
static CARD32 reconnect_timer(OsTimerPtr timer, CARD32 time, pointer arg); static CARD32 reconnect_timer(OsTimerPtr timer, CARD32 time, void *arg);
static void static void
wakeup_handler(pointer data, int err, pointer read_mask) wakeup_handler(void *data, int err, void *read_mask)
{ {
struct dbus_core_info *info = data; struct dbus_core_info *info = data;
@ -63,7 +63,7 @@ wakeup_handler(pointer data, int err, pointer read_mask)
} }
static void static void
block_handler(pointer data, struct timeval **tv, pointer read_mask) block_handler(void *data, struct timeval **tv, void *read_mask)
{ {
} }
@ -185,7 +185,7 @@ connect_to_bus(void)
} }
static CARD32 static CARD32
reconnect_timer(OsTimerPtr timer, CARD32 time, pointer arg) reconnect_timer(OsTimerPtr timer, CARD32 time, void *arg)
{ {
if (connect_to_bus()) { if (connect_to_bus()) {
TimerFree(bus_info.timer); TimerFree(bus_info.timer);

4
config/udev.c
View File

@ -291,7 +291,7 @@ device_removed(struct udev_device *device)
} }
static void static void
wakeup_handler(pointer data, int err, pointer read_mask) wakeup_handler(void *data, int err, void *read_mask)
{ {
int udev_fd = udev_monitor_get_fd(udev_monitor); int udev_fd = udev_monitor_get_fd(udev_monitor);
struct udev_device *udev_device; struct udev_device *udev_device;
@ -324,7 +324,7 @@ wakeup_handler(pointer data, int err, pointer read_mask)
} }
static void static void
block_handler(pointer data, struct timeval **tv, pointer read_mask) block_handler(void *data, struct timeval **tv, void *read_mask)
{ {
} }

6
damageext/damageext.c
View File

@ -245,7 +245,7 @@ DamageExtCreate(DrawablePtr pDrawable, DamageReportLevel level,
return NULL; return NULL;
} }
if (!AddResource(id, DamageExtType, (pointer) pDamageExt)) if (!AddResource(id, DamageExtType, (void *) pDamageExt))
return NULL; return NULL;
DamageExtRegister(pDrawable, pDamageExt->pDamage, DamageExtRegister(pDrawable, pDamageExt->pDamage,
@ -569,7 +569,7 @@ SProcDamageDispatch(ClientPtr client)
} }
static void static void
DamageClientCallback(CallbackListPtr *list, pointer closure, pointer data) DamageClientCallback(CallbackListPtr *list, void *closure, void *data)
{ {
NewClientInfoRec *clientinfo = (NewClientInfoRec *) data; NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
ClientPtr pClient = clientinfo->client; ClientPtr pClient = clientinfo->client;
@ -587,7 +587,7 @@ DamageResetProc(ExtensionEntry * extEntry)
} }
static int static int
FreeDamageExt(pointer value, XID did) FreeDamageExt(void *value, XID did)
{ {
DamageExtPtr pDamageExt = (DamageExtPtr) value; DamageExtPtr pDamageExt = (DamageExtPtr) value;

2
damageext/damageextint.h
View File

@ -58,7 +58,7 @@ typedef struct _DamageExt {
} DamageExtRec, *DamageExtPtr; } DamageExtRec, *DamageExtPtr;
#define VERIFY_DAMAGEEXT(pDamageExt, rid, client, mode) { \ #define VERIFY_DAMAGEEXT(pDamageExt, rid, client, mode) { \
int rc = dixLookupResourceByType((pointer *)&(pDamageExt), rid, \ int rc = dixLookupResourceByType((void **)&(pDamageExt), rid, \
DamageExtType, client, mode); \ DamageExtType, client, mode); \
if (rc != Success) \ if (rc != Success) \
return rc; \ return rc; \

12
dbe/dbe.c
View File

@ -322,7 +322,7 @@ ProcDbeAllocateBackBufferName(ClientPtr client)
if (status == Success) { if (status == Success) {
pDbeWindowPriv->IDs[add_index] = stuff->buffer; pDbeWindowPriv->IDs[add_index] = stuff->buffer;
if (!AddResource(stuff->buffer, dbeWindowPrivResType, if (!AddResource(stuff->buffer, dbeWindowPrivResType,
(pointer) pDbeWindowPriv)) { (void *) pDbeWindowPriv)) {
pDbeWindowPriv->IDs[add_index] = DBE_FREE_ID_ELEMENT; pDbeWindowPriv->IDs[add_index] = DBE_FREE_ID_ELEMENT;
if (pDbeWindowPriv->nBufferIDs == 0) { if (pDbeWindowPriv->nBufferIDs == 0) {
@ -378,12 +378,12 @@ ProcDbeDeallocateBackBufferName(ClientPtr client)
REQUEST(xDbeDeallocateBackBufferNameReq); REQUEST(xDbeDeallocateBackBufferNameReq);
DbeWindowPrivPtr pDbeWindowPriv; DbeWindowPrivPtr pDbeWindowPriv;
int rc, i; int rc, i;
pointer val; void *val;
REQUEST_SIZE_MATCH(xDbeDeallocateBackBufferNameReq); REQUEST_SIZE_MATCH(xDbeDeallocateBackBufferNameReq);
/* Buffer name must be valid */ /* Buffer name must be valid */
rc = dixLookupResourceByType((pointer *) &pDbeWindowPriv, stuff->buffer, rc = dixLookupResourceByType((void **) &pDbeWindowPriv, stuff->buffer,
dbeWindowPrivResType, client, dbeWindowPrivResType, client,
DixDestroyAccess); DixDestroyAccess);
if (rc != Success) if (rc != Success)
@ -726,7 +726,7 @@ ProcDbeGetBackBufferAttributes(ClientPtr client)
REQUEST_SIZE_MATCH(xDbeGetBackBufferAttributesReq); REQUEST_SIZE_MATCH(xDbeGetBackBufferAttributesReq);
rc = dixLookupResourceByType((pointer *) &pDbeWindowPriv, stuff->buffer, rc = dixLookupResourceByType((void **) &pDbeWindowPriv, stuff->buffer,
dbeWindowPrivResType, client, dbeWindowPrivResType, client,
DixGetAttrAccess); DixGetAttrAccess);
if (rc == Success) { if (rc == Success) {
@ -1125,7 +1125,7 @@ DbeSetupBackgroundPainter(WindowPtr pWin, GCPtr pGC)
* *
*****************************************************************************/ *****************************************************************************/
static int static int
DbeDrawableDelete(pointer pDrawable, XID id) DbeDrawableDelete(void *pDrawable, XID id)
{ {
return Success; return Success;
@ -1143,7 +1143,7 @@ DbeDrawableDelete(pointer pDrawable, XID id)
* *
*****************************************************************************/ *****************************************************************************/
static int static int
DbeWindowPrivDelete(pointer pDbeWinPriv, XID id) DbeWindowPrivDelete(void *pDbeWinPriv, XID id)
{ {
DbeScreenPrivPtr pDbeScreenPriv; DbeScreenPrivPtr pDbeScreenPriv;
DbeWindowPrivPtr pDbeWindowPriv = (DbeWindowPrivPtr) pDbeWinPriv; DbeWindowPrivPtr pDbeWindowPriv = (DbeWindowPrivPtr) pDbeWinPriv;

4
dbe/midbe.c
View File

@ -202,7 +202,7 @@ miDbeAllocBackBufferName(WindowPtr pWin, XID bufId, int swapAction)
/* Associate the new ID with an existing pixmap. */ /* Associate the new ID with an existing pixmap. */
if (!AddResource(bufId, dbeDrawableResType, if (!AddResource(bufId, dbeDrawableResType,
(pointer) pDbeWindowPriv->pBackBuffer)) { (void *) pDbeWindowPriv->pBackBuffer)) {
return BadAlloc; return BadAlloc;
} }
@ -230,7 +230,7 @@ miDbeAliasBuffers(DbeWindowPrivPtr pDbeWindowPriv)
for (i = 0; i < pDbeWindowPriv->nBufferIDs; i++) { for (i = 0; i < pDbeWindowPriv->nBufferIDs; i++) {
ChangeResourceValue(pDbeWindowPriv->IDs[i], dbeDrawableResType, ChangeResourceValue(pDbeWindowPriv->IDs[i], dbeDrawableResType,
(pointer) pDbeWindowPriv->pBackBuffer); (void *) pDbeWindowPriv->pBackBuffer);
} }
} /* miDbeAliasBuffers() */ } /* miDbeAliasBuffers() */

26
dix/colormap.c
View File

@ -367,7 +367,7 @@ CreateColormap(Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
} }
pmap->flags |= BeingCreated; pmap->flags |= BeingCreated;
if (!AddResource(mid, RT_COLORMAP, (pointer) pmap)) if (!AddResource(mid, RT_COLORMAP, (void *) pmap))
return BadAlloc; return BadAlloc;
/* /*
@ -397,7 +397,7 @@ CreateColormap(Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
* \param value must conform to DeleteType * \param value must conform to DeleteType
*/ */
int int
FreeColormap(pointer value, XID mid) FreeColormap(void *value, XID mid)
{ {
int i; int i;
EntryPtr pent; EntryPtr pent;
@ -405,7 +405,7 @@ FreeColormap(pointer value, XID mid)
if (CLIENT_ID(mid) != SERVER_ID) { if (CLIENT_ID(mid) != SERVER_ID) {
(*pmap->pScreen->UninstallColormap) (pmap); (*pmap->pScreen->UninstallColormap) (pmap);
WalkTree(pmap->pScreen, (VisitWindowProcPtr) TellNoMap, (pointer) &mid); WalkTree(pmap->pScreen, (VisitWindowProcPtr) TellNoMap, (void *) &mid);
} }
/* This is the device's chance to undo anything it needs to, especially /* This is the device's chance to undo anything it needs to, especially
@ -474,7 +474,7 @@ TellNoMap(WindowPtr pwin, Colormap * pmid)
/* Tell window that pmid got uninstalled */ /* Tell window that pmid got uninstalled */
int int
TellLostMap(WindowPtr pwin, pointer value) TellLostMap(WindowPtr pwin, void *value)
{ {
Colormap *pmid = (Colormap *) value; Colormap *pmid = (Colormap *) value;
@ -499,7 +499,7 @@ TellLostMap(WindowPtr pwin, pointer value)
/* Tell window that pmid got installed */ /* Tell window that pmid got installed */
int int
TellGainedMap(WindowPtr pwin, pointer value) TellGainedMap(WindowPtr pwin, void *value)
{ {
Colormap *pmid = (Colormap *) value; Colormap *pmid = (Colormap *) value;
@ -845,7 +845,7 @@ AllocColor(ColormapPtr pmap,
pmap->pVisual->vid == pmap->pScreen->rootVisual) { pmap->pVisual->vid == pmap->pScreen->rootVisual) {
ColormapPtr prootmap; ColormapPtr prootmap;
dixLookupResourceByType((pointer *) &prootmap, dixLookupResourceByType((void **) &prootmap,
pmap->pScreen->defColormap, RT_COLORMAP, pmap->pScreen->defColormap, RT_COLORMAP,
clients[client], DixReadAccess); clients[client], DixReadAccess);
@ -863,7 +863,7 @@ AllocColor(ColormapPtr pmap,
pmap->pVisual->vid == pmap->pScreen->rootVisual) { pmap->pVisual->vid == pmap->pScreen->rootVisual) {
ColormapPtr prootmap; ColormapPtr prootmap;
dixLookupResourceByType((pointer *) &prootmap, dixLookupResourceByType((void **) &prootmap,
pmap->pScreen->defColormap, RT_COLORMAP, pmap->pScreen->defColormap, RT_COLORMAP,
clients[client], DixReadAccess); clients[client], DixReadAccess);
@ -917,7 +917,7 @@ AllocColor(ColormapPtr pmap,
} }
pcr->mid = pmap->mid; pcr->mid = pmap->mid;
pcr->client = client; pcr->client = client;
if (!AddResource(FakeClientID(client), RT_CMAPENTRY, (pointer) pcr)) if (!AddResource(FakeClientID(client), RT_CMAPENTRY, (void *) pcr))
return BadAlloc; return BadAlloc;
} }
return Success; return Success;
@ -1463,9 +1463,9 @@ FreePixels(ColormapPtr pmap, int client)
* \unused fakeid * \unused fakeid
*/ */
int int
FreeClientPixels(pointer value, XID fakeid) FreeClientPixels(void *value, XID fakeid)
{ {
pointer pmap; void *pmap;
colorResource *pcr = value; colorResource *pcr = value;
int rc; int rc;
@ -1532,7 +1532,7 @@ AllocColorCells(int client, ColormapPtr pmap, int colors, int planes,
if ((ok == Success) && pcr) { if ((ok == Success) && pcr) {
pcr->mid = pmap->mid; pcr->mid = pmap->mid;
pcr->client = client; pcr->client = client;
if (!AddResource(FakeClientID(client), RT_CMAPENTRY, (pointer) pcr)) if (!AddResource(FakeClientID(client), RT_CMAPENTRY, (void *) pcr))
ok = BadAlloc; ok = BadAlloc;
} }
else else
@ -1614,7 +1614,7 @@ AllocColorPlanes(int client, ColormapPtr pmap, int colors,
if ((ok == Success) && pcr) { if ((ok == Success) && pcr) {
pcr->mid = pmap->mid; pcr->mid = pmap->mid;
pcr->client = client; pcr->client = client;
if (!AddResource(FakeClientID(client), RT_CMAPENTRY, (pointer) pcr)) if (!AddResource(FakeClientID(client), RT_CMAPENTRY, (void *) pcr))
ok = BadAlloc; ok = BadAlloc;
} }
else else
@ -2492,7 +2492,7 @@ struct colormap_lookup_data {
}; };
static void static void
_colormap_find_resource(pointer value, XID id, pointer cdata) _colormap_find_resource(void *value, XID id, void *cdata)
{ {
struct colormap_lookup_data *cmap_data = cdata; struct colormap_lookup_data *cmap_data = cdata;
VisualPtr visuals = cmap_data->visuals; VisualPtr visuals = cmap_data->visuals;

10
dix/cursor.c
View File

@ -104,7 +104,7 @@ FreeCursorBits(CursorBitsPtr bits)
* \param value must conform to DeleteType * \param value must conform to DeleteType
*/ */
int int
FreeCursor(pointer value, XID cid) FreeCursor(void *value, XID cid)
{ {
int nscr; int nscr;
CursorPtr pCurs = (CursorPtr) value; CursorPtr pCurs = (CursorPtr) value;
@ -319,13 +319,13 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
CursorPtr pCurs; CursorPtr pCurs;
GlyphSharePtr pShare; GlyphSharePtr pShare;
rc = dixLookupResourceByType((pointer *) &sourcefont, source, RT_FONT, rc = dixLookupResourceByType((void **) &sourcefont, source, RT_FONT,
client, DixUseAccess); client, DixUseAccess);
if (rc != Success) { if (rc != Success) {
client->errorValue = source; client->errorValue = source;
return rc; return rc;
} }
rc = dixLookupResourceByType((pointer *) &maskfont, mask, RT_FONT, client, rc = dixLookupResourceByType((void **) &maskfont, mask, RT_FONT, client,
DixUseAccess); DixUseAccess);
if (rc != Success && mask != None) { if (rc != Success && mask != None) {
client->errorValue = mask; client->errorValue = mask;
@ -486,7 +486,7 @@ CreateRootCursor(char *unused1, unsigned int unused2)
if (err != Success) if (err != Success)
return NullCursor; return NullCursor;
err = dixLookupResourceByType((pointer *) &cursorfont, fontID, RT_FONT, err = dixLookupResourceByType((void **) &cursorfont, fontID, RT_FONT,
serverClient, DixReadAccess); serverClient, DixReadAccess);
if (err != Success) if (err != Success)
return NullCursor; return NullCursor;
@ -494,7 +494,7 @@ CreateRootCursor(char *unused1, unsigned int unused2)
&curs, serverClient, (XID) 0) != Success) &curs, serverClient, (XID) 0) != Success)
return NullCursor; return NullCursor;
if (!AddResource(FakeClientID(0), RT_CURSOR, (pointer) curs)) if (!AddResource(FakeClientID(0), RT_CURSOR, (void *) curs))
return NullCursor; return NullCursor;
return curs; return curs;

32
dix/devices.c
View File

@ -386,7 +386,7 @@ EnableDevice(DeviceIntPtr dev, BOOL sendevent)
} }
else { else {
if (dev->coreEvents) if (dev->coreEvents)
other = (IsPointerDevice(dev)) ? inputInfo.pointer : other = (IsPointerDevice(dev)) ? inputInfo.pointer:
inputInfo.keyboard; inputInfo.keyboard;
else else
other = NULL; /* auto-float non-core devices */ other = NULL; /* auto-float non-core devices */
@ -586,7 +586,7 @@ ActivateDevice(DeviceIntPtr dev, BOOL sendevent)
* The actual task of ringing the bell is the job of the DDX. * The actual task of ringing the bell is the job of the DDX.
*/ */
static void static void
CoreKeyboardBell(int volume, DeviceIntPtr pDev, pointer arg, int something) CoreKeyboardBell(int volume, DeviceIntPtr pDev, void *arg, int something)
{ {
KeybdCtrl *ctrl = arg; KeybdCtrl *ctrl = arg;
@ -750,7 +750,7 @@ InitAndStartDevices(void)
* Free the given device class and reset the pointer to NULL. * Free the given device class and reset the pointer to NULL.
*/ */
static void static void
FreeDeviceClass(int type, pointer *class) FreeDeviceClass(int type, void **class)
{ {
if (!(*class)) if (!(*class))
return; return;
@ -818,7 +818,7 @@ FreeDeviceClass(int type, pointer *class)
} }
static void static void
FreeFeedbackClass(int type, pointer *class) FreeFeedbackClass(int type, void **class)
{ {
if (!(*class)) if (!(*class))
return; return;
@ -906,19 +906,19 @@ FreeAllDeviceClasses(ClassesPtr classes)
if (!classes) if (!classes)
return; return;
FreeDeviceClass(KeyClass, (pointer) &classes->key); FreeDeviceClass(KeyClass, (void *) &classes->key);
FreeDeviceClass(ValuatorClass, (pointer) &classes->valuator); FreeDeviceClass(ValuatorClass, (void *) &classes->valuator);
FreeDeviceClass(XITouchClass, (pointer) &classes->touch); FreeDeviceClass(XITouchClass, (void *) &classes->touch);
FreeDeviceClass(ButtonClass, (pointer) &classes->button); FreeDeviceClass(ButtonClass, (void *) &classes->button);
FreeDeviceClass(FocusClass, (pointer) &classes->focus); FreeDeviceClass(FocusClass, (void *) &classes->focus);
FreeDeviceClass(ProximityClass, (pointer) &classes->proximity); FreeDeviceClass(ProximityClass, (void *) &classes->proximity);
FreeFeedbackClass(KbdFeedbackClass, (pointer) &classes->kbdfeed); FreeFeedbackClass(KbdFeedbackClass, (void *) &classes->kbdfeed);
FreeFeedbackClass(PtrFeedbackClass, (pointer) &classes->ptrfeed); FreeFeedbackClass(PtrFeedbackClass, (void *) &classes->ptrfeed);
FreeFeedbackClass(IntegerFeedbackClass, (pointer) &classes->intfeed); FreeFeedbackClass(IntegerFeedbackClass, (void *) &classes->intfeed);
FreeFeedbackClass(StringFeedbackClass, (pointer) &classes->stringfeed); FreeFeedbackClass(StringFeedbackClass, (void *) &classes->stringfeed);
FreeFeedbackClass(BellFeedbackClass, (pointer) &classes->bell); FreeFeedbackClass(BellFeedbackClass, (void *) &classes->bell);
FreeFeedbackClass(LedFeedbackClass, (pointer) &classes->leds); FreeFeedbackClass(LedFeedbackClass, (void *) &classes->leds);
} }

78
dix/dispatch.c
View File

@ -652,7 +652,7 @@ ProcCreateWindow(ClientPtr client)
Mask mask = pWin->eventMask; Mask mask = pWin->eventMask;
pWin->eventMask = 0; /* subterfuge in case AddResource fails */ pWin->eventMask = 0; /* subterfuge in case AddResource fails */
if (!AddResource(stuff->wid, RT_WINDOW, (pointer) pWin)) if (!AddResource(stuff->wid, RT_WINDOW, (void *) pWin))
return BadAlloc; return BadAlloc;
pWin->eventMask = mask; pWin->eventMask = mask;
} }
@ -1069,7 +1069,7 @@ ProcGrabServer(ClientPtr client)
grabinfo.client = client; grabinfo.client = client;
grabinfo.grabstate = SERVER_GRABBED; grabinfo.grabstate = SERVER_GRABBED;
CallCallbacks(&ServerGrabCallback, (pointer) &grabinfo); CallCallbacks(&ServerGrabCallback, (void *) &grabinfo);
} }
return Success; return Success;
@ -1096,7 +1096,7 @@ UngrabServer(ClientPtr client)
grabinfo.client = client; grabinfo.client = client;
grabinfo.grabstate = SERVER_UNGRABBED; grabinfo.grabstate = SERVER_UNGRABBED;
CallCallbacks(&ServerGrabCallback, (pointer) &grabinfo); CallCallbacks(&ServerGrabCallback, (void *) &grabinfo);
} }
} }
@ -1208,7 +1208,7 @@ ProcCloseFont(ClientPtr client)
REQUEST(xResourceReq); REQUEST(xResourceReq);
REQUEST_SIZE_MATCH(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq);
rc = dixLookupResourceByType((pointer *) &pFont, stuff->id, RT_FONT, rc = dixLookupResourceByType((void **) &pFont, stuff->id, RT_FONT,
client, DixDestroyAccess); client, DixDestroyAccess);
if (rc == Success) { if (rc == Success) {
FreeResource(stuff->id, RT_NONE); FreeResource(stuff->id, RT_NONE);
@ -1335,7 +1335,7 @@ ProcListFontsWithInfo(ClientPtr client)
* \param value must conform to DeleteType * \param value must conform to DeleteType
*/ */
int int
dixDestroyPixmap(pointer value, XID pid) dixDestroyPixmap(void *value, XID pid)
{ {
PixmapPtr pPixmap = (PixmapPtr) value; PixmapPtr pPixmap = (PixmapPtr) value;
@ -1402,7 +1402,7 @@ ProcCreatePixmap(ClientPtr client)
(*pDraw->pScreen->DestroyPixmap) (pMap); (*pDraw->pScreen->DestroyPixmap) (pMap);
return rc; return rc;
} }
if (AddResource(stuff->pid, RT_PIXMAP, (pointer) pMap)) if (AddResource(stuff->pid, RT_PIXMAP, (void *) pMap))
return Success; return Success;
} }
return BadAlloc; return BadAlloc;
@ -1417,7 +1417,7 @@ ProcFreePixmap(ClientPtr client)
REQUEST(xResourceReq); REQUEST(xResourceReq);
REQUEST_SIZE_MATCH(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq);
rc = dixLookupResourceByType((pointer *) &pMap, stuff->id, RT_PIXMAP, rc = dixLookupResourceByType((void **) &pMap, stuff->id, RT_PIXMAP,
client, DixDestroyAccess); client, DixDestroyAccess);
if (rc == Success) { if (rc == Success) {
FreeResource(stuff->id, RT_NONE); FreeResource(stuff->id, RT_NONE);
@ -1454,7 +1454,7 @@ ProcCreateGC(ClientPtr client)
stuff->gc, client); stuff->gc, client);
if (error != Success) if (error != Success)
return error; return error;
if (!AddResource(stuff->gc, RT_GC, (pointer) pGC)) if (!AddResource(stuff->gc, RT_GC, (void *) pGC))
return BadAlloc; return BadAlloc;
return Success; return Success;
} }
@ -2121,7 +2121,7 @@ DoGetImage(ClientPtr client, int format, Drawable drawable,
y + linesDone, y + linesDone,
width, width,
nlines, nlines,
format, planemask, (pointer) pBuf); format, planemask, (void *) pBuf);
if (pVisibleRegion) if (pVisibleRegion)
XaceCensorImage(client, pVisibleRegion, widthBytesLine, XaceCensorImage(client, pVisibleRegion, widthBytesLine,
pDraw, x, y + linesDone, width, pDraw, x, y + linesDone, width,
@ -2148,7 +2148,7 @@ DoGetImage(ClientPtr client, int format, Drawable drawable,
y + linesDone, y + linesDone,
width, width,
nlines, nlines,
format, plane, (pointer) pBuf); format, plane, (void *) pBuf);
if (pVisibleRegion) if (pVisibleRegion)
XaceCensorImage(client, pVisibleRegion, XaceCensorImage(client, pVisibleRegion,
widthBytesLine, widthBytesLine,
@ -2308,7 +2308,7 @@ ProcFreeColormap(ClientPtr client)
REQUEST(xResourceReq); REQUEST(xResourceReq);
REQUEST_SIZE_MATCH(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq);
rc = dixLookupResourceByType((pointer *) &pmap, stuff->id, RT_COLORMAP, rc = dixLookupResourceByType((void **) &pmap, stuff->id, RT_COLORMAP,
client, DixDestroyAccess); client, DixDestroyAccess);
if (rc == Success) { if (rc == Success) {
/* Freeing a default colormap is a no-op */ /* Freeing a default colormap is a no-op */
@ -2334,7 +2334,7 @@ ProcCopyColormapAndFree(ClientPtr client)
REQUEST_SIZE_MATCH(xCopyColormapAndFreeReq); REQUEST_SIZE_MATCH(xCopyColormapAndFreeReq);
mid = stuff->mid; mid = stuff->mid;
LEGAL_NEW_RESOURCE(mid, client); LEGAL_NEW_RESOURCE(mid, client);
rc = dixLookupResourceByType((pointer *) &pSrcMap, stuff->srcCmap, rc = dixLookupResourceByType((void **) &pSrcMap, stuff->srcCmap,
RT_COLORMAP, client, RT_COLORMAP, client,
DixReadAccess | DixRemoveAccess); DixReadAccess | DixRemoveAccess);
if (rc == Success) if (rc == Success)
@ -2352,7 +2352,7 @@ ProcInstallColormap(ClientPtr client)
REQUEST(xResourceReq); REQUEST(xResourceReq);
REQUEST_SIZE_MATCH(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq);
rc = dixLookupResourceByType((pointer *) &pcmp, stuff->id, RT_COLORMAP, rc = dixLookupResourceByType((void **) &pcmp, stuff->id, RT_COLORMAP,
client, DixInstallAccess); client, DixInstallAccess);
if (rc != Success) if (rc != Success)
goto out; goto out;
@ -2381,7 +2381,7 @@ ProcUninstallColormap(ClientPtr client)
REQUEST(xResourceReq); REQUEST(xResourceReq);
REQUEST_SIZE_MATCH(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq);
rc = dixLookupResourceByType((pointer *) &pcmp, stuff->id, RT_COLORMAP, rc = dixLookupResourceByType((void **) &pcmp, stuff->id, RT_COLORMAP,
client, DixUninstallAccess); client, DixUninstallAccess);
if (rc != Success) if (rc != Success)
goto out; goto out;
@ -2449,7 +2449,7 @@ ProcAllocColor(ClientPtr client)
REQUEST(xAllocColorReq); REQUEST(xAllocColorReq);
REQUEST_SIZE_MATCH(xAllocColorReq); REQUEST_SIZE_MATCH(xAllocColorReq);
rc = dixLookupResourceByType((pointer *) &pmap, stuff->cmap, RT_COLORMAP, rc = dixLookupResourceByType((void **) &pmap, stuff->cmap, RT_COLORMAP,
client, DixAddAccess); client, DixAddAccess);
if (rc == Success) { if (rc == Success) {
xAllocColorReply acr = { xAllocColorReply acr = {
@ -2486,7 +2486,7 @@ ProcAllocNamedColor(ClientPtr client)
REQUEST(xAllocNamedColorReq); REQUEST(xAllocNamedColorReq);
REQUEST_FIXED_SIZE(xAllocNamedColorReq, stuff->nbytes); REQUEST_FIXED_SIZE(xAllocNamedColorReq, stuff->nbytes);
rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP, rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP,
client, DixAddAccess); client, DixAddAccess);
if (rc == Success) { if (rc == Success) {
xAllocNamedColorReply ancr = { xAllocNamedColorReply ancr = {
@ -2531,7 +2531,7 @@ ProcAllocColorCells(ClientPtr client)
REQUEST(xAllocColorCellsReq); REQUEST(xAllocColorCellsReq);
REQUEST_SIZE_MATCH(xAllocColorCellsReq); REQUEST_SIZE_MATCH(xAllocColorCellsReq);
rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP, rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP,
client, DixAddAccess); client, DixAddAccess);
if (rc == Success) { if (rc == Success) {
int npixels, nmasks; int npixels, nmasks;
@ -2592,7 +2592,7 @@ ProcAllocColorPlanes(ClientPtr client)
REQUEST(xAllocColorPlanesReq); REQUEST(xAllocColorPlanesReq);
REQUEST_SIZE_MATCH(xAllocColorPlanesReq); REQUEST_SIZE_MATCH(xAllocColorPlanesReq);
rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP, rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP,
client, DixAddAccess); client, DixAddAccess);
if (rc == Success) { if (rc == Success) {
xAllocColorPlanesReply acpr; xAllocColorPlanesReply acpr;
@ -2654,7 +2654,7 @@ ProcFreeColors(ClientPtr client)
REQUEST(xFreeColorsReq); REQUEST(xFreeColorsReq);
REQUEST_AT_LEAST_SIZE(xFreeColorsReq); REQUEST_AT_LEAST_SIZE(xFreeColorsReq);
rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP, rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP,
client, DixRemoveAccess); client, DixRemoveAccess);
if (rc == Success) { if (rc == Success) {
int count; int count;
@ -2680,7 +2680,7 @@ ProcStoreColors(ClientPtr client)
REQUEST(xStoreColorsReq); REQUEST(xStoreColorsReq);
REQUEST_AT_LEAST_SIZE(xStoreColorsReq); REQUEST_AT_LEAST_SIZE(xStoreColorsReq);
rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP, rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP,
client, DixWriteAccess); client, DixWriteAccess);
if (rc == Success) { if (rc == Success) {
int count; int count;
@ -2706,7 +2706,7 @@ ProcStoreNamedColor(ClientPtr client)
REQUEST(xStoreNamedColorReq); REQUEST(xStoreNamedColorReq);
REQUEST_FIXED_SIZE(xStoreNamedColorReq, stuff->nbytes); REQUEST_FIXED_SIZE(xStoreNamedColorReq, stuff->nbytes);
rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP, rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP,
client, DixWriteAccess); client, DixWriteAccess);
if (rc == Success) { if (rc == Success) {
xColorItem def; xColorItem def;
@ -2734,7 +2734,7 @@ ProcQueryColors(ClientPtr client)
REQUEST(xQueryColorsReq); REQUEST(xQueryColorsReq);
REQUEST_AT_LEAST_SIZE(xQueryColorsReq); REQUEST_AT_LEAST_SIZE(xQueryColorsReq);
rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP, rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP,
client, DixReadAccess); client, DixReadAccess);
if (rc == Success) { if (rc == Success) {
int count; int count;
@ -2781,7 +2781,7 @@ ProcLookupColor(ClientPtr client)
REQUEST(xLookupColorReq); REQUEST(xLookupColorReq);
REQUEST_FIXED_SIZE(xLookupColorReq, stuff->nbytes); REQUEST_FIXED_SIZE(xLookupColorReq, stuff->nbytes);
rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP, rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP,
client, DixReadAccess); client, DixReadAccess);
if (rc == Success) { if (rc == Success) {
CARD16 exactRed, exactGreen, exactBlue; CARD16 exactRed, exactGreen, exactBlue;
@ -2832,7 +2832,7 @@ ProcCreateCursor(ClientPtr client)
REQUEST_SIZE_MATCH(xCreateCursorReq); REQUEST_SIZE_MATCH(xCreateCursorReq);
LEGAL_NEW_RESOURCE(stuff->cid, client); LEGAL_NEW_RESOURCE(stuff->cid, client);
rc = dixLookupResourceByType((pointer *) &src, stuff->source, RT_PIXMAP, rc = dixLookupResourceByType((void **) &src, stuff->source, RT_PIXMAP,
client, DixReadAccess); client, DixReadAccess);
if (rc != Success) { if (rc != Success) {
client->errorValue = stuff->source; client->errorValue = stuff->source;
@ -2844,7 +2844,7 @@ ProcCreateCursor(ClientPtr client)
/* Find and validate cursor mask pixmap, if one is provided */ /* Find and validate cursor mask pixmap, if one is provided */
if (stuff->mask != None) { if (stuff->mask != None) {
rc = dixLookupResourceByType((pointer *) &msk, stuff->mask, RT_PIXMAP, rc = dixLookupResourceByType((void **) &msk, stuff->mask, RT_PIXMAP,
client, DixReadAccess); client, DixReadAccess);
if (rc != Success) { if (rc != Success) {
client->errorValue = stuff->mask; client->errorValue = stuff->mask;
@ -2876,7 +2876,7 @@ ProcCreateCursor(ClientPtr client)
} }
(*src->drawable.pScreen->GetImage) ((DrawablePtr) src, 0, 0, width, height, (*src->drawable.pScreen->GetImage) ((DrawablePtr) src, 0, 0, width, height,
XYPixmap, 1, (pointer) srcbits); XYPixmap, 1, (void *) srcbits);
if (msk == (PixmapPtr) NULL) { if (msk == (PixmapPtr) NULL) {
unsigned char *bits = mskbits; unsigned char *bits = mskbits;
@ -2888,7 +2888,7 @@ ProcCreateCursor(ClientPtr client)
memset((char *) mskbits, 0, n); memset((char *) mskbits, 0, n);
(*msk->drawable.pScreen->GetImage) ((DrawablePtr) msk, 0, 0, width, (*msk->drawable.pScreen->GetImage) ((DrawablePtr) msk, 0, 0, width,
height, XYPixmap, 1, height, XYPixmap, 1,
(pointer) mskbits); (void *) mskbits);
} }
cm.width = width; cm.width = width;
cm.height = height; cm.height = height;
@ -2901,7 +2901,7 @@ ProcCreateCursor(ClientPtr client)
if (rc != Success) if (rc != Success)
goto bail; goto bail;
if (!AddResource(stuff->cid, RT_CURSOR, (pointer) pCursor)) { if (!AddResource(stuff->cid, RT_CURSOR, (void *) pCursor)) {
rc = BadAlloc; rc = BadAlloc;
goto bail; goto bail;
} }
@ -2931,7 +2931,7 @@ ProcCreateGlyphCursor(ClientPtr client)
&pCursor, client, stuff->cid); &pCursor, client, stuff->cid);
if (res != Success) if (res != Success)
return res; return res;
if (AddResource(stuff->cid, RT_CURSOR, (pointer) pCursor)) if (AddResource(stuff->cid, RT_CURSOR, (void *) pCursor))
return Success; return Success;
return BadAlloc; return BadAlloc;
} }
@ -2945,7 +2945,7 @@ ProcFreeCursor(ClientPtr client)
REQUEST(xResourceReq); REQUEST(xResourceReq);
REQUEST_SIZE_MATCH(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq);
rc = dixLookupResourceByType((pointer *) &pCursor, stuff->id, RT_CURSOR, rc = dixLookupResourceByType((void **) &pCursor, stuff->id, RT_CURSOR,
client, DixDestroyAccess); client, DixDestroyAccess);
if (rc == Success) { if (rc == Success) {
FreeResource(stuff->id, RT_NONE); FreeResource(stuff->id, RT_NONE);
@ -3094,10 +3094,10 @@ ProcChangeHosts(ClientPtr client)
if (stuff->mode == HostInsert) if (stuff->mode == HostInsert)
return AddHost(client, (int) stuff->hostFamily, return AddHost(client, (int) stuff->hostFamily,
stuff->hostLength, (pointer) &stuff[1]); stuff->hostLength, (void *) &stuff[1]);
if (stuff->mode == HostDelete) if (stuff->mode == HostDelete)
return RemoveHost(client, (int) stuff->hostFamily, return RemoveHost(client, (int) stuff->hostFamily,
stuff->hostLength, (pointer) &stuff[1]); stuff->hostLength, (void *) &stuff[1]);
client->errorValue = stuff->mode; client->errorValue = stuff->mode;
return BadValue; return BadValue;
} }
@ -3108,7 +3108,7 @@ ProcListHosts(ClientPtr client)
xListHostsReply reply; xListHostsReply reply;
int len, nHosts, result; int len, nHosts, result;
BOOL enabled; BOOL enabled;
pointer pdata; void *pdata;
/* REQUEST(xListHostsReq); */ /* REQUEST(xListHostsReq); */
@ -3349,7 +3349,7 @@ CloseDownClient(ClientPtr client)
clientinfo.client = client; clientinfo.client = client;
clientinfo.prefix = (xConnSetupPrefix *) NULL; clientinfo.prefix = (xConnSetupPrefix *) NULL;
clientinfo.setup = (xConnSetup *) NULL; clientinfo.setup = (xConnSetup *) NULL;
CallCallbacks((&ClientStateCallback), (pointer) &clientinfo); CallCallbacks((&ClientStateCallback), (void *) &clientinfo);
} }
} }
client->clientGone = TRUE; /* so events aren't sent to client */ client->clientGone = TRUE; /* so events aren't sent to client */
@ -3379,7 +3379,7 @@ CloseDownClient(ClientPtr client)
clientinfo.client = client; clientinfo.client = client;
clientinfo.prefix = (xConnSetupPrefix *) NULL; clientinfo.prefix = (xConnSetupPrefix *) NULL;
clientinfo.setup = (xConnSetup *) NULL; clientinfo.setup = (xConnSetup *) NULL;
CallCallbacks((&ClientStateCallback), (pointer) &clientinfo); CallCallbacks((&ClientStateCallback), (void *) &clientinfo);
} }
TouchListenerGone(client->clientAsMask); TouchListenerGone(client->clientAsMask);
FreeClientResources(client); FreeClientResources(client);
@ -3414,7 +3414,7 @@ KillAllClients(void)
} }
void void
InitClient(ClientPtr client, int i, pointer ospriv) InitClient(ClientPtr client, int i, void *ospriv)
{ {
client->index = i; client->index = i;
client->clientAsMask = ((Mask) i) << CLIENTOFFSET; client->clientAsMask = ((Mask) i) << CLIENTOFFSET;
@ -3436,7 +3436,7 @@ InitClient(ClientPtr client, int i, pointer ospriv)
*************************/ *************************/
ClientPtr ClientPtr
NextAvailableClient(pointer ospriv) NextAvailableClient(void *ospriv)
{ {
int i; int i;
ClientPtr client; ClientPtr client;
@ -3476,7 +3476,7 @@ NextAvailableClient(pointer ospriv)
clientinfo.client = client; clientinfo.client = client;
clientinfo.prefix = (xConnSetupPrefix *) NULL; clientinfo.prefix = (xConnSetupPrefix *) NULL;
clientinfo.setup = (xConnSetup *) NULL; clientinfo.setup = (xConnSetup *) NULL;
CallCallbacks((&ClientStateCallback), (pointer) &clientinfo); CallCallbacks((&ClientStateCallback), (void *) &clientinfo);
} }
return client; return client;
} }
@ -3596,7 +3596,7 @@ SendConnSetup(ClientPtr client, const char *reason)
clientinfo.client = client; clientinfo.client = client;
clientinfo.prefix = lconnSetupPrefix; clientinfo.prefix = lconnSetupPrefix;
clientinfo.setup = (xConnSetup *) lConnectionInfo; clientinfo.setup = (xConnSetup *) lConnectionInfo;
CallCallbacks((&ClientStateCallback), (pointer) &clientinfo); CallCallbacks((&ClientStateCallback), (void *) &clientinfo);
} }
return Success; return Success;
} }

50
dix/dixfonts.c
View File

@ -70,7 +70,7 @@ Equipment Corporation.
#include "xf86bigfontsrv.h" #include "xf86bigfontsrv.h"
#endif #endif
extern pointer fosNaturalParams; extern void *fosNaturalParams;
extern FontPtr defaultFont; extern FontPtr defaultFont;
static FontPathElementPtr *font_path_elements = (FontPathElementPtr *) 0; static FontPathElementPtr *font_path_elements = (FontPathElementPtr *) 0;
@ -139,7 +139,7 @@ SetDefaultFont(const char *defaultfontname)
(unsigned) strlen(defaultfontname), defaultfontname); (unsigned) strlen(defaultfontname), defaultfontname);
if (err != Success) if (err != Success)
return FALSE; return FALSE;
err = dixLookupResourceByType((pointer *) &pf, fid, RT_FONT, serverClient, err = dixLookupResourceByType((void **) &pf, fid, RT_FONT, serverClient,
DixReadAccess); DixReadAccess);
if (err != Success) if (err != Success)
return FALSE; return FALSE;
@ -197,7 +197,7 @@ RemoveFontWakeup(FontPathElementPtr fpe)
} }
void void
FontWakeup(pointer data, int count, pointer LastSelectMask) FontWakeup(void *data, int count, void *LastSelectMask)
{ {
int i; int i;
FontPathElementPtr fpe; FontPathElementPtr fpe;
@ -267,7 +267,7 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
if (client->clientGone) { if (client->clientGone) {
if (c->current_fpe < c->num_fpes) { if (c->current_fpe < c->num_fpes) {
fpe = c->fpe_list[c->current_fpe]; fpe = c->fpe_list[c->current_fpe];
(*fpe_functions[fpe->type].client_died) ((pointer) client, fpe); (*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
} }
err = Successful; err = Successful;
goto bail; goto bail;
@ -275,7 +275,7 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
while (c->current_fpe < c->num_fpes) { while (c->current_fpe < c->num_fpes) {
fpe = c->fpe_list[c->current_fpe]; fpe = c->fpe_list[c->current_fpe];
err = (*fpe_functions[fpe->type].open_font) err = (*fpe_functions[fpe->type].open_font)
((pointer) client, fpe, c->flags, ((void *) client, fpe, c->flags,
c->fontname, c->fnamelen, FontFormat, c->fontname, c->fnamelen, FontFormat,
BitmapFormatMaskByte | BitmapFormatMaskByte |
BitmapFormatMaskBit | BitmapFormatMaskBit |
@ -350,7 +350,7 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
} }
} }
} }
if (!AddResource(c->fontid, RT_FONT, (pointer) pfont)) { if (!AddResource(c->fontid, RT_FONT, (void *) pfont)) {
err = AllocError; err = AllocError;
goto bail; goto bail;
} }
@ -404,7 +404,7 @@ OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname,
cached = FindCachedFontPattern(patternCache, pfontname, lenfname); cached = FindCachedFontPattern(patternCache, pfontname, lenfname);
if (cached && cached->info.cachable) { if (cached && cached->info.cachable) {
if (!AddResource(fid, RT_FONT, (pointer) cached)) if (!AddResource(fid, RT_FONT, (void *) cached))
return BadAlloc; return BadAlloc;
cached->refcnt++; cached->refcnt++;
return Success; return Success;
@ -453,7 +453,7 @@ OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname,
* \param value must conform to DeleteType * \param value must conform to DeleteType
*/ */
int int
CloseFont(pointer value, XID fid) CloseFont(void *value, XID fid)
{ {
int nscr; int nscr;
ScreenPtr pscr; ScreenPtr pscr;
@ -571,7 +571,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
if (client->clientGone) { if (client->clientGone) {
if (c->current.current_fpe < c->num_fpes) { if (c->current.current_fpe < c->num_fpes) {
fpe = c->fpe_list[c->current.current_fpe]; fpe = c->fpe_list[c->current.current_fpe];
(*fpe_functions[fpe->type].client_died) ((pointer) client, fpe); (*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
} }
err = Successful; err = Successful;
goto bail; goto bail;
@ -588,7 +588,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
/* This FPE doesn't support/require list_fonts_and_aliases */ /* This FPE doesn't support/require list_fonts_and_aliases */
err = (*fpe_functions[fpe->type].list_fonts) err = (*fpe_functions[fpe->type].list_fonts)
((pointer) c->client, fpe, c->current.pattern, ((void *) c->client, fpe, c->current.pattern,
c->current.patlen, c->current.max_names - c->names->nnames, c->current.patlen, c->current.max_names - c->names->nnames,
c->names); c->names);
@ -615,7 +615,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
if (!c->current.list_started) { if (!c->current.list_started) {
err = (*fpe_functions[fpe->type].start_list_fonts_and_aliases) err = (*fpe_functions[fpe->type].start_list_fonts_and_aliases)
((pointer) c->client, fpe, c->current.pattern, ((void *) c->client, fpe, c->current.pattern,
c->current.patlen, c->current.max_names - c->names->nnames, c->current.patlen, c->current.max_names - c->names->nnames,
&c->current.private); &c->current.private);
if (err == Suspended) { if (err == Suspended) {
@ -635,7 +635,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
name = 0; name = 0;
err = (*fpe_functions[fpe->type].list_next_font_or_alias) err = (*fpe_functions[fpe->type].list_next_font_or_alias)
((pointer) c->client, fpe, &name, &namelen, &tmpname, ((void *) c->client, fpe, &name, &namelen, &tmpname,
&resolvedlen, c->current.private); &resolvedlen, c->current.private);
if (err == Suspended) { if (err == Suspended) {
if (!ClientIsAsleep(client)) if (!ClientIsAsleep(client))
@ -687,7 +687,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
tmpname = 0; tmpname = 0;
(void) (*fpe_functions[fpe->type].list_next_font_or_alias) (void) (*fpe_functions[fpe->type].list_next_font_or_alias)
((pointer) c->client, fpe, &tmpname, &tmpnamelen, ((void *) c->client, fpe, &tmpname, &tmpnamelen,
&tmpname, &tmpnamelen, c->current.private); &tmpname, &tmpnamelen, c->current.private);
if (--aliascount <= 0) { if (--aliascount <= 0) {
err = BadFontName; err = BadFontName;
@ -869,7 +869,7 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c)
if (client->clientGone) { if (client->clientGone) {
if (c->current.current_fpe < c->num_fpes) { if (c->current.current_fpe < c->num_fpes) {
fpe = c->fpe_list[c->current.current_fpe]; fpe = c->fpe_list[c->current.current_fpe];
(*fpe_functions[fpe->type].client_died) ((pointer) client, fpe); (*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
} }
err = Successful; err = Successful;
goto bail; goto bail;
@ -1118,12 +1118,12 @@ doPolyText(ClientPtr client, PTclosurePtr c)
if (client->clientGone) { if (client->clientGone) {
fpe = c->pGC->font->fpe; fpe = c->pGC->font->fpe;
(*fpe_functions[fpe->type].client_died) ((pointer) client, fpe); (*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
if (ClientIsAsleep(client)) { if (ClientIsAsleep(client)) {
/* Client has died, but we cannot bail out right now. We /* Client has died, but we cannot bail out right now. We
need to clean up after the work we did when going to need to clean up after the work we did when going to
sleep. Setting the drawable pointer to 0 makes this sleep. Setting the drawable poiner to 0 makes this
happen without any attempts to render or perform other happen without any attempts to render or perform other
unnecessary activities. */ unnecessary activities. */
c->pDraw = (DrawablePtr) 0; c->pDraw = (DrawablePtr) 0;
@ -1144,7 +1144,7 @@ doPolyText(ClientPtr client, PTclosurePtr c)
the FPE code to clean up after client and avoid further the FPE code to clean up after client and avoid further
rendering while we clean up after ourself. */ rendering while we clean up after ourself. */
fpe = c->pGC->font->fpe; fpe = c->pGC->font->fpe;
(*fpe_functions[fpe->type].client_died) ((pointer) client, fpe); (*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
c->pDraw = (DrawablePtr) 0; c->pDraw = (DrawablePtr) 0;
} }
} }
@ -1165,7 +1165,7 @@ doPolyText(ClientPtr client, PTclosurePtr c)
fid = ((Font) *(c->pElt + 4)) /* big-endian */ fid = ((Font) *(c->pElt + 4)) /* big-endian */
|((Font) *(c->pElt + 3)) << 8 |((Font) *(c->pElt + 3)) << 8
| ((Font) *(c->pElt + 2)) << 16 | ((Font) *(c->pElt + 1)) << 24; | ((Font) *(c->pElt + 2)) << 16 | ((Font) *(c->pElt + 1)) << 24;
err = dixLookupResourceByType((pointer *) &pFont, fid, RT_FONT, err = dixLookupResourceByType((void **) &pFont, fid, RT_FONT,
client, DixUseAccess); client, DixUseAccess);
if (err != Success) { if (err != Success) {
/* restore pFont for step 4 (described below) */ /* restore pFont for step 4 (described below) */
@ -1399,7 +1399,7 @@ doImageText(ClientPtr client, ITclosurePtr c)
if (client->clientGone) { if (client->clientGone) {
fpe = c->pGC->font->fpe; fpe = c->pGC->font->fpe;
(*fpe_functions[fpe->type].client_died) ((pointer) client, fpe); (*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
err = Success; err = Success;
goto bail; goto bail;
} }
@ -1413,7 +1413,7 @@ doImageText(ClientPtr client, ITclosurePtr c)
/* Our drawable has disappeared. Treat like client died... ask /* Our drawable has disappeared. Treat like client died... ask
the FPE code to clean up after client. */ the FPE code to clean up after client. */
fpe = c->pGC->font->fpe; fpe = c->pGC->font->fpe;
(*fpe_functions[fpe->type].client_died) ((pointer) client, fpe); (*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
err = Success; err = Success;
goto bail; goto bail;
} }
@ -1819,7 +1819,7 @@ DeleteClientFontStuff(ClientPtr client)
for (i = 0; i < num_fpes; i++) { for (i = 0; i < num_fpes; i++) {
fpe = font_path_elements[i]; fpe = font_path_elements[i];
if (fpe_functions[fpe->type].client_died) if (fpe_functions[fpe->type].client_died)
(*fpe_functions[fpe->type].client_died) ((pointer) client, fpe); (*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
} }
} }
@ -1937,7 +1937,7 @@ FreeFonts(void)
FontPtr FontPtr
find_old_font(XID id) find_old_font(XID id)
{ {
pointer pFont; void *pFont;
dixLookupResourceByType(&pFont, id, RT_NONE, serverClient, DixReadAccess); dixLookupResourceByType(&pFont, id, RT_NONE, serverClient, DixReadAccess);
return (FontPtr) pFont; return (FontPtr) pFont;
@ -1954,7 +1954,7 @@ _X_EXPORT
int int
StoreFontClientFont(FontPtr pfont, Font id) StoreFontClientFont(FontPtr pfont, Font id)
{ {
return AddResource(id, RT_NONE, (pointer) pfont); return AddResource(id, RT_NONE, (void *) pfont);
} }
_X_EXPORT _X_EXPORT
@ -1985,7 +1985,7 @@ init_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler)
} }
if (fs_handlers_installed == 0) { if (fs_handlers_installed == 0) {
if (!RegisterBlockAndWakeupHandlers(block_handler, if (!RegisterBlockAndWakeupHandlers(block_handler,
FontWakeup, (pointer) 0)) FontWakeup, (void *) 0))
return AllocError; return AllocError;
fs_handlers_installed++; fs_handlers_installed++;
} }
@ -2002,7 +2002,7 @@ remove_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler,
/* remove the handlers if no one else is using them */ /* remove the handlers if no one else is using them */
if (--fs_handlers_installed == 0) { if (--fs_handlers_installed == 0) {
RemoveBlockAndWakeupHandlers(block_handler, FontWakeup, RemoveBlockAndWakeupHandlers(block_handler, FontWakeup,
(pointer) 0); (void *) 0);
} }
} }
RemoveFontWakeup(fpe); RemoveFontWakeup(fpe);

40
dix/dixutils.c
View File

@ -199,7 +199,7 @@ dixLookupDrawable(DrawablePtr *pDraw, XID id, ClientPtr client,
*pDraw = NULL; *pDraw = NULL;
rc = dixLookupResourceByClass((pointer *) &pTmp, id, RC_DRAWABLE, client, rc = dixLookupResourceByClass((void **) &pTmp, id, RC_DRAWABLE, client,
access); access);
if (rc != Success) if (rc != Success)
@ -236,7 +236,7 @@ dixLookupWindow(WindowPtr *pWin, XID id, ClientPtr client, Mask access)
int int
dixLookupGC(GCPtr *pGC, XID id, ClientPtr client, Mask access) dixLookupGC(GCPtr *pGC, XID id, ClientPtr client, Mask access)
{ {
return dixLookupResourceByType((pointer *) pGC, id, RT_GC, client, access); return dixLookupResourceByType((void **) pGC, id, RT_GC, client, access);
} }
int int
@ -246,11 +246,11 @@ dixLookupFontable(FontPtr *pFont, XID id, ClientPtr client, Mask access)
GC *pGC; GC *pGC;
client->errorValue = id; /* EITHER font or gc */ client->errorValue = id; /* EITHER font or gc */
rc = dixLookupResourceByType((pointer *) pFont, id, RT_FONT, client, rc = dixLookupResourceByType((void **) pFont, id, RT_FONT, client,
access); access);
if (rc != BadFont) if (rc != BadFont)
return rc; return rc;
rc = dixLookupResourceByType((pointer *) &pGC, id, RT_GC, client, access); rc = dixLookupResourceByType((void **) &pGC, id, RT_GC, client, access);
if (rc == BadGC) if (rc == BadGC)
return BadFont; return BadFont;
if (rc == Success) if (rc == Success)
@ -261,7 +261,7 @@ dixLookupFontable(FontPtr *pFont, XID id, ClientPtr client, Mask access)
int int
dixLookupClient(ClientPtr *pClient, XID rid, ClientPtr client, Mask access) dixLookupClient(ClientPtr *pClient, XID rid, ClientPtr client, Mask access)
{ {
pointer pRes; void *pRes;
int rc = BadValue, clientIndex = CLIENT_ID(rid); int rc = BadValue, clientIndex = CLIENT_ID(rid);
if (!clientIndex || !clients[clientIndex] || (rid & SERVER_BIT)) if (!clientIndex || !clients[clientIndex] || (rid & SERVER_BIT))
@ -296,7 +296,7 @@ AlterSaveSetForClient(ClientPtr client, WindowPtr pWin, unsigned mode,
j = 0; j = 0;
if (numnow) { if (numnow) {
pTmp = client->saveSet; pTmp = client->saveSet;
while ((j < numnow) && (SaveSetWindow(pTmp[j]) != (pointer) pWin)) while ((j < numnow) && (SaveSetWindow(pTmp[j]) != (void *) pWin))
j++; j++;
} }
if (mode == SetModeInsert) { if (mode == SetModeInsert) {
@ -362,7 +362,7 @@ NoopDDA(void)
typedef struct _BlockHandler { typedef struct _BlockHandler {
BlockHandlerProcPtr BlockHandler; BlockHandlerProcPtr BlockHandler;
WakeupHandlerProcPtr WakeupHandler; WakeupHandlerProcPtr WakeupHandler;
pointer blockData; void *blockData;
Bool deleted; Bool deleted;
} BlockHandlerRec, *BlockHandlerPtr; } BlockHandlerRec, *BlockHandlerPtr;
@ -378,7 +378,7 @@ static Bool handlerDeleted;
* \param pReadMask nor how it represents the det of descriptors * \param pReadMask nor how it represents the det of descriptors
*/ */
void void
BlockHandler(pointer pTimeout, pointer pReadmask) BlockHandler(void *pTimeout, void *pReadmask)
{ {
int i, j; int i, j;
@ -413,7 +413,7 @@ BlockHandler(pointer pTimeout, pointer pReadmask)
* \param pReadmask the resulting descriptor mask * \param pReadmask the resulting descriptor mask
*/ */
void void
WakeupHandler(int result, pointer pReadmask) WakeupHandler(int result, void *pReadmask)
{ {
int i, j; int i, j;
@ -449,7 +449,7 @@ WakeupHandler(int result, pointer pReadmask)
Bool Bool
RegisterBlockAndWakeupHandlers(BlockHandlerProcPtr blockHandler, RegisterBlockAndWakeupHandlers(BlockHandlerProcPtr blockHandler,
WakeupHandlerProcPtr wakeupHandler, WakeupHandlerProcPtr wakeupHandler,
pointer blockData) void *blockData)
{ {
BlockHandlerPtr new; BlockHandlerPtr new;
@ -472,7 +472,7 @@ RegisterBlockAndWakeupHandlers(BlockHandlerProcPtr blockHandler,
void void
RemoveBlockAndWakeupHandlers(BlockHandlerProcPtr blockHandler, RemoveBlockAndWakeupHandlers(BlockHandlerProcPtr blockHandler,
WakeupHandlerProcPtr wakeupHandler, WakeupHandlerProcPtr wakeupHandler,
pointer blockData) void *blockData)
{ {
int i; int i;
@ -557,8 +557,8 @@ ProcessWorkQueueZombies(void)
Bool Bool
QueueWorkProc(Bool (*function) QueueWorkProc(Bool (*function)
(ClientPtr /* pClient */ , pointer /* closure */ ), (ClientPtr /* pClient */ , void */* closure */ ),
ClientPtr client, pointer closure) ClientPtr client, void *closure)
{ {
WorkQueuePtr q; WorkQueuePtr q;
@ -586,13 +586,13 @@ typedef struct _SleepQueue {
struct _SleepQueue *next; struct _SleepQueue *next;
ClientPtr client; ClientPtr client;
ClientSleepProcPtr function; ClientSleepProcPtr function;
pointer closure; void *closure;
} SleepQueueRec, *SleepQueuePtr; } SleepQueueRec, *SleepQueuePtr;
static SleepQueuePtr sleepQueue = NULL; static SleepQueuePtr sleepQueue = NULL;
Bool Bool
ClientSleep(ClientPtr client, ClientSleepProcPtr function, pointer closure) ClientSleep(ClientPtr client, ClientSleepProcPtr function, void *closure)
{ {
SleepQueuePtr q; SleepQueuePtr q;
@ -666,7 +666,7 @@ static int numCallbackListsToCleanup = 0;
static CallbackListPtr **listsToCleanup = NULL; static CallbackListPtr **listsToCleanup = NULL;
static Bool static Bool
_AddCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data) _AddCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, void *data)
{ {
CallbackPtr cbr; CallbackPtr cbr;
@ -682,7 +682,7 @@ _AddCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data)
} }
static Bool static Bool
_DeleteCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data) _DeleteCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, void *data)
{ {
CallbackListPtr cbl = *pcbl; CallbackListPtr cbl = *pcbl;
CallbackPtr cbr, pcbr; CallbackPtr cbr, pcbr;
@ -709,7 +709,7 @@ _DeleteCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data)
} }
void void
_CallCallbacks(CallbackListPtr *pcbl, pointer call_data) _CallCallbacks(CallbackListPtr *pcbl, void *call_data)
{ {
CallbackListPtr cbl = *pcbl; CallbackListPtr cbl = *pcbl;
CallbackPtr cbr, pcbr; CallbackPtr cbr, pcbr;
@ -821,7 +821,7 @@ CreateCallbackList(CallbackListPtr *pcbl)
/* ===== Public Procedures ===== */ /* ===== Public Procedures ===== */
Bool Bool
AddCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data) AddCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, void *data)
{ {
if (!pcbl) if (!pcbl)
return FALSE; return FALSE;
@ -833,7 +833,7 @@ AddCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data)
} }
Bool Bool
DeleteCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data) DeleteCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, void *data)
{ {
if (!pcbl || !*pcbl) if (!pcbl || !*pcbl)
return FALSE; return FALSE;

18
dix/events.c
View File

@ -580,7 +580,7 @@ XineramaSetWindowPntrs(DeviceIntPtr pDev, WindowPtr pWin)
PanoramiXRes *win; PanoramiXRes *win;
int rc, i; int rc, i;
rc = dixLookupResourceByType((pointer *) &win, pWin->drawable.id, rc = dixLookupResourceByType((void **) &win, pWin->drawable.id,
XRT_WINDOW, serverClient, DixReadAccess); XRT_WINDOW, serverClient, DixReadAccess);
if (rc != Success) if (rc != Success)
return FALSE; return FALSE;
@ -1162,7 +1162,7 @@ EnqueueEvent(InternalEvent *ev, DeviceIntPtr device)
eventinfo.event = ev; eventinfo.event = ev;
eventinfo.device = device; eventinfo.device = device;
CallCallbacks(&DeviceEventCallback, (pointer) &eventinfo); CallCallbacks(&DeviceEventCallback, (void *) &eventinfo);
} }
if (event->type == ET_Motion) { if (event->type == ET_Motion) {
@ -4417,7 +4417,7 @@ RecalculateDeliverableEvents(WindowPtr pWin)
* \param value must conform to DeleteType * \param value must conform to DeleteType
*/ */
int int
OtherClientGone(pointer value, XID id) OtherClientGone(void *value, XID id)
{ {
OtherClientsPtr other, prev; OtherClientsPtr other, prev;
WindowPtr pWin = (WindowPtr) value; WindowPtr pWin = (WindowPtr) value;
@ -4498,7 +4498,7 @@ EventSelectForWindow(WindowPtr pWin, ClientPtr client, Mask mask)
others->resource = FakeClientID(client->index); others->resource = FakeClientID(client->index);
others->next = pWin->optional->otherClients; others->next = pWin->optional->otherClients;
pWin->optional->otherClients = others; pWin->optional->otherClients = others;
if (!AddResource(others->resource, RT_OTHERCLIENT, (pointer) pWin)) if (!AddResource(others->resource, RT_OTHERCLIENT, (void *) pWin))
return BadAlloc; return BadAlloc;
} }
maskSet: maskSet:
@ -4985,7 +4985,7 @@ ProcChangeActivePointerGrab(ClientPtr client)
if (stuff->cursor == None) if (stuff->cursor == None)
newCursor = NullCursor; newCursor = NullCursor;
else { else {
int rc = dixLookupResourceByType((pointer *) &newCursor, stuff->cursor, int rc = dixLookupResourceByType((void **) &newCursor, stuff->cursor,
RT_CURSOR, client, DixUseAccess); RT_CURSOR, client, DixUseAccess);
if (rc != Success) { if (rc != Success) {
@ -5102,7 +5102,7 @@ GrabDevice(ClientPtr client, DeviceIntPtr dev,
if (curs == None) if (curs == None)
cursor = NullCursor; cursor = NullCursor;
else { else {
rc = dixLookupResourceByType((pointer *) &cursor, curs, RT_CURSOR, rc = dixLookupResourceByType((void **) &cursor, curs, RT_CURSOR,
client, DixUseAccess); client, DixUseAccess);
if (rc != Success) { if (rc != Success) {
client->errorValue = curs; client->errorValue = curs;
@ -5628,7 +5628,7 @@ ProcGrabButton(ClientPtr client)
if (stuff->cursor == None) if (stuff->cursor == None)
cursor = NullCursor; cursor = NullCursor;
else { else {
rc = dixLookupResourceByType((pointer *) &cursor, stuff->cursor, rc = dixLookupResourceByType((void **) &cursor, stuff->cursor,
RT_CURSOR, client, DixUseAccess); RT_CURSOR, client, DixUseAccess);
if (rc != Success) { if (rc != Success) {
client->errorValue = stuff->cursor; client->errorValue = stuff->cursor;
@ -5882,7 +5882,7 @@ ProcRecolorCursor(ClientPtr client)
REQUEST(xRecolorCursorReq); REQUEST(xRecolorCursorReq);
REQUEST_SIZE_MATCH(xRecolorCursorReq); REQUEST_SIZE_MATCH(xRecolorCursorReq);
rc = dixLookupResourceByType((pointer *) &pCursor, stuff->cursor, RT_CURSOR, rc = dixLookupResourceByType((void **) &pCursor, stuff->cursor, RT_CURSOR,
client, DixWriteAccess); client, DixWriteAccess);
if (rc != Success) { if (rc != Success) {
client->errorValue = stuff->cursor; client->errorValue = stuff->cursor;
@ -5983,7 +5983,7 @@ WriteEventsToClient(ClientPtr pClient, int count, xEvent *events)
eventinfo.client = pClient; eventinfo.client = pClient;
eventinfo.events = events; eventinfo.events = events;
eventinfo.count = count; eventinfo.count = count;
CallCallbacks(&EventCallback, (pointer) &eventinfo); CallCallbacks(&EventCallback, (void *) &eventinfo);
} }
#ifdef XSERVER_DTRACE #ifdef XSERVER_DTRACE
if (XSERVER_SEND_EVENT_ENABLED()) { if (XSERVER_SEND_EVENT_ENABLED()) {

8
dix/gc.c
View File

@ -339,7 +339,7 @@ ChangeGC(ClientPtr client, GC * pGC, BITS32 mask, ChangeGCValPtr pUnion)
pPixmap->refcnt++; pPixmap->refcnt++;
} }
(*pGC->funcs->ChangeClip) (pGC, pPixmap ? CT_PIXMAP : CT_NONE, (*pGC->funcs->ChangeClip) (pGC, pPixmap ? CT_PIXMAP : CT_NONE,
(pointer) pPixmap, 0); (void *) pPixmap, 0);
break; break;
case GCDashOffset: case GCDashOffset:
NEXTVAL(INT16, pGC->dashOffset); NEXTVAL(INT16, pGC->dashOffset);
@ -494,7 +494,7 @@ NewGCObject(ScreenPtr pScreen, int depth)
pGC->clipOrg.x = 0; pGC->clipOrg.x = 0;
pGC->clipOrg.y = 0; pGC->clipOrg.y = 0;
pGC->clientClipType = CT_NONE; pGC->clientClipType = CT_NONE;
pGC->clientClip = (pointer) NULL; pGC->clientClip = (void *) NULL;
pGC->numInDashList = 2; pGC->numInDashList = 2;
pGC->dash = DefaultDash; pGC->dash = DefaultDash;
pGC->dashOffset = 0; pGC->dashOffset = 0;
@ -764,7 +764,7 @@ CopyGC(GC * pgcSrc, GC * pgcDst, BITS32 mask)
* \param value must conform to DeleteType * \param value must conform to DeleteType
*/ */
int int
FreeGC(pointer value, XID gid) FreeGC(void *value, XID gid)
{ {
GCPtr pGC = (GCPtr) value; GCPtr pGC = (GCPtr) value;
@ -1023,7 +1023,7 @@ SetClipRects(GCPtr pGC, int xOrigin, int yOrigin, int nrects,
if (size) if (size)
memmove((char *) prectsNew, (char *) prects, size); memmove((char *) prectsNew, (char *) prects, size);
(*pGC->funcs->ChangeClip) (pGC, newct, (pointer) prectsNew, nrects); (*pGC->funcs->ChangeClip) (pGC, newct, (void *) prectsNew, nrects);
if (pGC->funcs->ChangeGC) if (pGC->funcs->ChangeGC)
(*pGC->funcs->ChangeGC) (pGC, (*pGC->funcs->ChangeGC) (pGC,
GCClipXOrigin | GCClipYOrigin | GCClipMask); GCClipXOrigin | GCClipYOrigin | GCClipMask);

2
dix/glyphcurs.c
View File

@ -114,7 +114,7 @@ ServerBitsFromGlyph(FontPtr pfont, unsigned ch, CursorMetricPtr cm,
/* fill the pixmap with 0 */ /* fill the pixmap with 0 */
gcval[0].val = GXcopy; gcval[0].val = GXcopy;
gcval[1].val = 0; gcval[1].val = 0;
gcval[2].ptr = (pointer) pfont; gcval[2].ptr = (void *) pfont;
ChangeGC(NullClient, pGC, GCFunction | GCForeground | GCFont, gcval); ChangeGC(NullClient, pGC, GCFunction | GCForeground | GCFont, gcval);
ValidateGC((DrawablePtr) ppix, pGC); ValidateGC((DrawablePtr) ppix, pGC);
(*pGC->ops->PolyFillRect) ((DrawablePtr) ppix, pGC, 1, &rect); (*pGC->ops->PolyFillRect) ((DrawablePtr) ppix, pGC, 1, &rect);

6
dix/grabs.c
View File

@ -317,7 +317,7 @@ CopyGrab(GrabPtr dst, const GrabPtr src)
} }
int int
DeletePassiveGrab(pointer value, XID id) DeletePassiveGrab(void *value, XID id)
{ {
GrabPtr g, prev; GrabPtr g, prev;
GrabPtr pGrab = (GrabPtr) value; GrabPtr pGrab = (GrabPtr) value;
@ -564,7 +564,7 @@ AddPassiveGrabToList(ClientPtr client, GrabPtr pGrab)
pGrab->next = pGrab->window->optional->passiveGrabs; pGrab->next = pGrab->window->optional->passiveGrabs;
pGrab->window->optional->passiveGrabs = pGrab; pGrab->window->optional->passiveGrabs = pGrab;
if (AddResource(pGrab->resource, RT_PASSIVEGRAB, (pointer) pGrab)) if (AddResource(pGrab->resource, RT_PASSIVEGRAB, (void *) pGrab))
return Success; return Success;
return BadAlloc; return BadAlloc;
} }
@ -662,7 +662,7 @@ DeletePassiveGrabFromList(GrabPtr pMinuendGrab)
ok = FALSE; ok = FALSE;
} }
else if (!AddResource(pNewGrab->resource, RT_PASSIVEGRAB, else if (!AddResource(pNewGrab->resource, RT_PASSIVEGRAB,
(pointer) pNewGrab)) (void *) pNewGrab))
ok = FALSE; ok = FALSE;
else else
adds[nadds++] = pNewGrab; adds[nadds++] = pNewGrab;

2
dix/main.c
View File

@ -168,7 +168,7 @@ dix_main(int argc, char *argv[], char *envp[])
serverClient = calloc(sizeof(ClientRec), 1); serverClient = calloc(sizeof(ClientRec), 1);
if (!serverClient) if (!serverClient)
FatalError("couldn't create server client"); FatalError("couldn't create server client");
InitClient(serverClient, 0, (pointer) NULL); InitClient(serverClient, 0, (void *) NULL);
} }
else else
ResetWellKnownSockets(); ResetWellKnownSockets();

2
dix/pixmap.c
View File

@ -49,7 +49,7 @@ from The Open Group.
/* callable by ddx */ /* callable by ddx */
PixmapPtr PixmapPtr
GetScratchPixmapHeader(ScreenPtr pScreen, int width, int height, int depth, GetScratchPixmapHeader(ScreenPtr pScreen, int width, int height, int depth,
int bitsPerPixel, int devKind, pointer pPixData) int bitsPerPixel, int devKind, void *pPixData)
{ {
PixmapPtr pPixmap = pScreen->pScratchPixmap; PixmapPtr pPixmap = pScreen->pScratchPixmap;

6
dix/privates.c
View File

@ -259,7 +259,7 @@ fixupDefaultColormaps(FixupFunc fixup, unsigned bytes)
for (s = 0; s < screenInfo.numScreens; s++) { for (s = 0; s < screenInfo.numScreens; s++) {
ColormapPtr cmap; ColormapPtr cmap;
dixLookupResourceByType((pointer *) &cmap, dixLookupResourceByType((void **) &cmap,
screenInfo.screens[s]->defColormap, RT_COLORMAP, screenInfo.screens[s]->defColormap, RT_COLORMAP,
serverClient, DixCreateAccess); serverClient, DixCreateAccess);
if (cmap && if (cmap &&
@ -348,7 +348,7 @@ dixRegisterPrivateKey(DevPrivateKey key, DevPrivateType type, unsigned size)
if (size == 0) if (size == 0)
bytes = sizeof(void *); bytes = sizeof(void *);
/* align to void * size */ /* align to pointer size */
bytes = (bytes + sizeof(void *) - 1) & ~(sizeof(void *) - 1); bytes = (bytes + sizeof(void *) - 1) & ~(sizeof(void *) - 1);
/* Update offsets for all affected keys */ /* Update offsets for all affected keys */
@ -697,7 +697,7 @@ _dixAllocateScreenObjectWithPrivates(ScreenPtr pScreen,
privates_size = pScreen->screenSpecificPrivates[type].offset; privates_size = pScreen->screenSpecificPrivates[type].offset;
else else
privates_size = global_keys[type].offset; privates_size = global_keys[type].offset;
/* round up so that void * is aligned */ /* round up so that pointer is aligned */
baseSize = (baseSize + sizeof(void *) - 1) & ~(sizeof(void *) - 1); baseSize = (baseSize + sizeof(void *) - 1) & ~(sizeof(void *) - 1);
totalSize = baseSize + privates_size; totalSize = baseSize + privates_size;
object = malloc(totalSize); object = malloc(totalSize);

4
dix/property.c
View File

@ -242,7 +242,7 @@ ProcChangeProperty(ClientPtr client)
int int
dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property, dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
Atom type, int format, int mode, unsigned long len, Atom type, int format, int mode, unsigned long len,
pointer value, Bool sendevent) void *value, Bool sendevent)
{ {
PropertyPtr pProp; PropertyPtr pProp;
PropertyRec savedProp; PropertyRec savedProp;
@ -356,7 +356,7 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
int int
ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
int mode, unsigned long len, pointer value, Bool sendevent) int mode, unsigned long len, void *value, Bool sendevent)
{ {
return dixChangeWindowProperty(serverClient, pWin, property, type, format, return dixChangeWindowProperty(serverClient, pWin, property, type, format,
mode, len, value, sendevent); mode, len, value, sendevent);

42
dix/resource.c
View File

@ -165,7 +165,7 @@ typedef struct _Resource {
struct _Resource *next; struct _Resource *next;
XID id; XID id;
RESTYPE type; RESTYPE type;
pointer value; void *value;
} ResourceRec, *ResourcePtr; } ResourceRec, *ResourcePtr;
typedef struct _ClientResource { typedef struct _ClientResource {
@ -203,7 +203,7 @@ struct ResourceType {
* resource can't be determined. * resource can't be determined.
*/ */
static void static void
GetDefaultBytes(pointer value, XID id, ResourceSizePtr size) GetDefaultBytes(void *value, XID id, ResourceSizePtr size)
{ {
size->resourceSize = 0; size->resourceSize = 0;
size->pixmapRefSize = 0; size->pixmapRefSize = 0;
@ -224,7 +224,7 @@ GetDefaultBytes(pointer value, XID id, ResourceSizePtr size)
* @param[out] cdata Pointer to opaque data. * @param[out] cdata Pointer to opaque data.
*/ */
static void static void
DefaultFindSubRes(pointer value, FindAllRes func, pointer cdata) DefaultFindSubRes(void *value, FindAllRes func, void *cdata)
{ {
/* do nothing */ /* do nothing */
} }
@ -268,7 +268,7 @@ GetDrawableBytes(DrawablePtr drawable)
* pixmap reference. * pixmap reference.
*/ */
static void static void
GetPixmapBytes(pointer value, XID id, ResourceSizePtr size) GetPixmapBytes(void *value, XID id, ResourceSizePtr size)
{ {
PixmapPtr pixmap = value; PixmapPtr pixmap = value;
@ -297,7 +297,7 @@ GetPixmapBytes(pointer value, XID id, ResourceSizePtr size)
* pixmap references of a window. * pixmap references of a window.
*/ */
static void static void
GetWindowBytes(pointer value, XID id, ResourceSizePtr size) GetWindowBytes(void *value, XID id, ResourceSizePtr size)
{ {
SizeType pixmapSizeFunc = GetResourceTypeSizeFunc(RT_PIXMAP); SizeType pixmapSizeFunc = GetResourceTypeSizeFunc(RT_PIXMAP);
ResourceSizeRec pixmapSize = { 0, 0, 0 }; ResourceSizeRec pixmapSize = { 0, 0, 0 };
@ -339,7 +339,7 @@ GetWindowBytes(pointer value, XID id, ResourceSizePtr size)
* @param[out] cdata Pointer to opaque data * @param[out] cdata Pointer to opaque data
*/ */
static void static void
FindWindowSubRes(pointer value, FindAllRes func, pointer cdata) FindWindowSubRes(void *value, FindAllRes func, void *cdata)
{ {
WindowPtr window = value; WindowPtr window = value;
@ -370,7 +370,7 @@ FindWindowSubRes(pointer value, FindAllRes func, pointer cdata)
* pixmap references of a graphics context. * pixmap references of a graphics context.
*/ */
static void static void
GetGcBytes(pointer value, XID id, ResourceSizePtr size) GetGcBytes(void *value, XID id, ResourceSizePtr size)
{ {
SizeType pixmapSizeFunc = GetResourceTypeSizeFunc(RT_PIXMAP); SizeType pixmapSizeFunc = GetResourceTypeSizeFunc(RT_PIXMAP);
ResourceSizeRec pixmapSize = { 0, 0, 0 }; ResourceSizeRec pixmapSize = { 0, 0, 0 };
@ -411,7 +411,7 @@ GetGcBytes(pointer value, XID id, ResourceSizePtr size)
* @param[out] cdata Pointer to opaque data * @param[out] cdata Pointer to opaque data
*/ */
static void static void
FindGCSubRes(pointer value, FindAllRes func, pointer cdata) FindGCSubRes(void *value, FindAllRes func, void *cdata)
{ {
GCPtr gc = value; GCPtr gc = value;
@ -743,7 +743,7 @@ GetXIDList(ClientPtr pClient, unsigned count, XID *pids)
unsigned int found = 0; unsigned int found = 0;
XID rc, id = pClient->clientAsMask; XID rc, id = pClient->clientAsMask;
XID maxid; XID maxid;
pointer val; void *val;
maxid = id | RESOURCE_ID_MASK; maxid = id | RESOURCE_ID_MASK;
while ((found < count) && (id <= maxid)) { while ((found < count) && (id <= maxid)) {
@ -787,7 +787,7 @@ FakeClientID(int client)
} }
Bool Bool
AddResource(XID id, RESTYPE type, pointer value) AddResource(XID id, RESTYPE type, void *value)
{ {
int client; int client;
ClientResourceRec *rrec; ClientResourceRec *rrec;
@ -948,7 +948,7 @@ FreeResourceByType(XID id, RESTYPE type, Bool skipFree)
*/ */
Bool Bool
ChangeResourceValue(XID id, RESTYPE rtype, pointer value) ChangeResourceValue(XID id, RESTYPE rtype, void *value)
{ {
int cid; int cid;
ResourcePtr res; ResourcePtr res;
@ -973,7 +973,7 @@ ChangeResourceValue(XID id, RESTYPE rtype, pointer value)
void void
FindClientResourcesByType(ClientPtr client, FindClientResourcesByType(ClientPtr client,
RESTYPE type, FindResType func, pointer cdata) RESTYPE type, FindResType func, void *cdata)
{ {
ResourcePtr *resources; ResourcePtr *resources;
ResourcePtr this, next; ResourcePtr this, next;
@ -998,17 +998,17 @@ FindClientResourcesByType(ClientPtr client,
} }
} }
void FindSubResources(pointer resource, void FindSubResources(void *resource,
RESTYPE type, RESTYPE type,
FindAllRes func, FindAllRes func,
pointer cdata) void *cdata)
{ {
struct ResourceType rtype = resourceTypes[type & TypeMask]; struct ResourceType rtype = resourceTypes[type & TypeMask];
rtype.findSubResFunc(resource, func, cdata); rtype.findSubResFunc(resource, func, cdata);
} }
void void
FindAllClientResources(ClientPtr client, FindAllRes func, pointer cdata) FindAllClientResources(ClientPtr client, FindAllRes func, void *cdata)
{ {
ResourcePtr *resources; ResourcePtr *resources;
ResourcePtr this, next; ResourcePtr this, next;
@ -1031,14 +1031,14 @@ FindAllClientResources(ClientPtr client, FindAllRes func, pointer cdata)
} }
} }
pointer void *
LookupClientResourceComplex(ClientPtr client, LookupClientResourceComplex(ClientPtr client,
RESTYPE type, RESTYPE type,
FindComplexResType func, pointer cdata) FindComplexResType func, void *cdata)
{ {
ResourcePtr *resources; ResourcePtr *resources;
ResourcePtr this, next; ResourcePtr this, next;
pointer value; void *value;
int i; int i;
if (!client) if (!client)
@ -1158,7 +1158,7 @@ FreeAllResources(void)
Bool Bool
LegalNewID(XID id, ClientPtr client) LegalNewID(XID id, ClientPtr client)
{ {
pointer val; void *val;
int rc; int rc;
#ifdef PANORAMIX #ifdef PANORAMIX
@ -1181,7 +1181,7 @@ LegalNewID(XID id, ClientPtr client)
} }
int int
dixLookupResourceByType(pointer *result, XID id, RESTYPE rtype, dixLookupResourceByType(void **result, XID id, RESTYPE rtype,
ClientPtr client, Mask mode) ClientPtr client, Mask mode)
{ {
int cid = CLIENT_ID(id); int cid = CLIENT_ID(id);
@ -1216,7 +1216,7 @@ dixLookupResourceByType(pointer *result, XID id, RESTYPE rtype,
} }
int int
dixLookupResourceByClass(pointer *result, XID id, RESTYPE rclass, dixLookupResourceByClass(void **result, XID id, RESTYPE rclass,
ClientPtr client, Mask mode) ClientPtr client, Mask mode)
{ {
int cid = CLIENT_ID(id); int cid = CLIENT_ID(id);

2
dix/touch.c
View File

@ -75,7 +75,7 @@ static unsigned char resize_waiting[(MAXDEVICES + 7) / 8];
* anyway and re-executing this won't help. * anyway and re-executing this won't help.
*/ */
static Bool static Bool
TouchResizeQueue(ClientPtr client, pointer closure) TouchResizeQueue(ClientPtr client, void *closure)
{ {
int i; int i;

28
dix/window.c
View File

@ -305,7 +305,7 @@ PrintWindowTree(void)
} }
int int
TraverseTree(WindowPtr pWin, VisitWindowProcPtr func, pointer data) TraverseTree(WindowPtr pWin, VisitWindowProcPtr func, void *data)
{ {
int result; int result;
WindowPtr pChild; WindowPtr pChild;
@ -338,7 +338,7 @@ TraverseTree(WindowPtr pWin, VisitWindowProcPtr func, pointer data)
*****/ *****/
int int
WalkTree(ScreenPtr pScreen, VisitWindowProcPtr func, pointer data) WalkTree(ScreenPtr pScreen, VisitWindowProcPtr func, void *data)
{ {
return (TraverseTree(pScreen->root, func, data)); return (TraverseTree(pScreen->root, func, data));
} }
@ -363,7 +363,7 @@ SetWindowToDefaults(WindowPtr pWin)
pWin->backingStore = NotUseful; pWin->backingStore = NotUseful;
pWin->DIXsaveUnder = FALSE; pWin->DIXsaveUnder = FALSE;
pWin->backStorage = (pointer) NULL; pWin->backStorage = (void *) NULL;
pWin->mapped = FALSE; /* off */ pWin->mapped = FALSE; /* off */
pWin->realized = FALSE; /* off */ pWin->realized = FALSE; /* off */
@ -524,7 +524,7 @@ CreateRootWindow(ScreenPtr pScreen)
RT_WINDOW, pWin, RT_NONE, NULL, DixCreateAccess)) RT_WINDOW, pWin, RT_NONE, NULL, DixCreateAccess))
return FALSE; return FALSE;
if (!AddResource(pWin->drawable.id, RT_WINDOW, (pointer) pWin)) if (!AddResource(pWin->drawable.id, RT_WINDOW, (void *) pWin))
return FALSE; return FALSE;
if (disableBackingStore) if (disableBackingStore)
@ -959,7 +959,7 @@ CrushTree(WindowPtr pWin)
*****/ *****/
int int
DeleteWindow(pointer value, XID wid) DeleteWindow(void *value, XID wid)
{ {
WindowPtr pParent; WindowPtr pParent;
WindowPtr pWin = (WindowPtr) value; WindowPtr pWin = (WindowPtr) value;
@ -1107,7 +1107,7 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
* incremented. */ * incremented. */
} }
else { else {
rc = dixLookupResourceByType((pointer *) &pPixmap, pixID, rc = dixLookupResourceByType((void **) &pPixmap, pixID,
RT_PIXMAP, client, DixReadAccess); RT_PIXMAP, client, DixReadAccess);
if (rc == Success) { if (rc == Success) {
if ((pPixmap->drawable.depth != pWin->drawable.depth) || if ((pPixmap->drawable.depth != pWin->drawable.depth) ||
@ -1161,7 +1161,7 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
pixID = pWin->parent->border.pixmap->drawable.id; pixID = pWin->parent->border.pixmap->drawable.id;
} }
} }
rc = dixLookupResourceByType((pointer *) &pPixmap, pixID, RT_PIXMAP, rc = dixLookupResourceByType((void **) &pPixmap, pixID, RT_PIXMAP,
client, DixReadAccess); client, DixReadAccess);
if (rc == Success) { if (rc == Success) {
if ((pPixmap->drawable.depth != pWin->drawable.depth) || if ((pPixmap->drawable.depth != pWin->drawable.depth) ||
@ -1308,7 +1308,7 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
error = BadMatch; error = BadMatch;
goto PatchUp; goto PatchUp;
} }
rc = dixLookupResourceByType((pointer *) &pCmap, cmap, RT_COLORMAP, rc = dixLookupResourceByType((void **) &pCmap, cmap, RT_COLORMAP,
client, DixUseAccess); client, DixUseAccess);
if (rc != Success) { if (rc != Success) {
error = rc; error = rc;
@ -1378,7 +1378,7 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
pCursor = (CursorPtr) None; pCursor = (CursorPtr) None;
} }
else { else {
rc = dixLookupResourceByType((pointer *) &pCursor, cursorID, rc = dixLookupResourceByType((void **) &pCursor, cursorID,
RT_CURSOR, client, DixUseAccess); RT_CURSOR, client, DixUseAccess);
if (rc != Success) { if (rc != Success) {
error = rc; error = rc;
@ -2377,7 +2377,7 @@ CirculateWindow(WindowPtr pParent, int direction, ClientPtr client)
} }
static int static int
CompareWIDs(WindowPtr pWin, pointer value) CompareWIDs(WindowPtr pWin, void *value)
{ /* must conform to VisitWindowProcPtr */ { /* must conform to VisitWindowProcPtr */
Window *wid = (Window *) value; Window *wid = (Window *) value;
@ -2402,7 +2402,7 @@ ReparentWindow(WindowPtr pWin, WindowPtr pParent,
ScreenPtr pScreen; ScreenPtr pScreen;
pScreen = pWin->drawable.pScreen; pScreen = pWin->drawable.pScreen;
if (TraverseTree(pWin, CompareWIDs, (pointer) &pParent->drawable.id) == if (TraverseTree(pWin, CompareWIDs, (void *) &pParent->drawable.id) ==
WT_STOPWALKING) WT_STOPWALKING)
return BadMatch; return BadMatch;
if (!MakeWindowOptional(pWin)) if (!MakeWindowOptional(pWin))
@ -2688,7 +2688,7 @@ UnrealizeTree(WindowPtr pWin, Bool fromConfigure)
#ifdef PANORAMIX #ifdef PANORAMIX
if (!noPanoramiXExtension && !pChild->drawable.pScreen->myNum) { if (!noPanoramiXExtension && !pChild->drawable.pScreen->myNum) {
PanoramiXRes *win; PanoramiXRes *win;
int rc = dixLookupResourceByType((pointer *) &win, int rc = dixLookupResourceByType((void **) &win,
pChild->drawable.id, pChild->drawable.id,
XRT_WINDOW, XRT_WINDOW,
serverClient, DixWriteAccess); serverClient, DixWriteAccess);
@ -3167,7 +3167,7 @@ TileScreenSaver(ScreenPtr pScreen, int kind)
&cursor, serverClient, (XID) 0); &cursor, serverClient, (XID) 0);
if (cursor) { if (cursor) {
cursorID = FakeClientID(0); cursorID = FakeClientID(0);
if (AddResource(cursorID, RT_CURSOR, (pointer) cursor)) { if (AddResource(cursorID, RT_CURSOR, (void *) cursor)) {
attributes[attri] = cursorID; attributes[attri] = cursorID;
mask |= CWCursor; mask |= CWCursor;
} }
@ -3196,7 +3196,7 @@ TileScreenSaver(ScreenPtr pScreen, int kind)
return FALSE; return FALSE;
if (!AddResource(pWin->drawable.id, RT_WINDOW, if (!AddResource(pWin->drawable.id, RT_WINDOW,
(pointer) pScreen->screensaver.pWindow)) (void *) pScreen->screensaver.pWindow))
return FALSE; return FALSE;
if (mask & CWBackPixmap) { if (mask & CWBackPixmap) {

6
dri3/dri3_event.c
View File

@ -29,7 +29,7 @@
RESTYPE dri3_event_type; RESTYPE dri3_event_type;
static int static int
dri3_free_event(pointer data, XID id) dri3_free_event(void *data, XID id)
{ {
dri3_event_ptr dri3_event = (dri3_event_ptr) data; dri3_event_ptr dri3_event = (dri3_event_ptr) data;
dri3_window_priv_ptr window_priv = dri3_window_priv(dri3_event->window); dri3_window_priv_ptr window_priv = dri3_window_priv(dri3_event->window);
@ -41,7 +41,7 @@ dri3_free_event(pointer data, XID id)
break; break;
} }
} }
free((pointer) dri3_event); free((void *) dri3_event);
return 1; return 1;
} }
@ -145,7 +145,7 @@ dri3_select_input(ClientPtr client, XID eid, WindowPtr window, CARD32 mask)
event->next = window_priv->events; event->next = window_priv->events;
window_priv->events = event; window_priv->events = event;
if (!AddResource(event->id, dri3_event_type, (pointer) event)) if (!AddResource(event->id, dri3_event_type, (void *) event))
return BadAlloc; return BadAlloc;
return Success; return Success;

4
dri3/dri3_request.c
View File

@ -168,7 +168,7 @@ proc_dri3_pixmap_from_buffer(ClientPtr client)
(*drawable->pScreen->DestroyPixmap) (pixmap); (*drawable->pScreen->DestroyPixmap) (pixmap);
return rc; return rc;
} }
if (AddResource(stuff->pixmap, RT_PIXMAP, (pointer) pixmap)) if (AddResource(stuff->pixmap, RT_PIXMAP, (void *) pixmap))
return Success; return Success;
return Success; return Success;
@ -189,7 +189,7 @@ proc_dri3_buffer_from_pixmap(ClientPtr client)
PixmapPtr pixmap; PixmapPtr pixmap;
REQUEST_SIZE_MATCH(xDRI3BufferFromPixmapReq); REQUEST_SIZE_MATCH(xDRI3BufferFromPixmapReq);
rc = dixLookupResourceByType((pointer *) &pixmap, stuff->pixmap, RT_PIXMAP, rc = dixLookupResourceByType((void **) &pixmap, stuff->pixmap, RT_PIXMAP,
client, DixWriteAccess); client, DixWriteAccess);
if (rc != Success) { if (rc != Success) {
client->errorValue = stuff->pixmap; client->errorValue = stuff->pixmap;

10
exa/exa.c
View File

@ -475,7 +475,7 @@ static void
exaCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst); exaCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst);
static void static void
exaChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects); exaChangeClip(GCPtr pGC, int type, void *pvalue, int nrects);
static void static void
exaCopyClip(GCPtr pGCDst, GCPtr pGCSrc); exaCopyClip(GCPtr pGCDst, GCPtr pGCSrc);
@ -579,7 +579,7 @@ exaCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst)
} }
static void static void
exaChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects) exaChangeClip(GCPtr pGC, int type, void *pvalue, int nrects)
{ {
ExaGCPriv(pGC); ExaGCPriv(pGC);
swap(pExaGC, pGC, funcs); swap(pExaGC, pGC, funcs);
@ -702,8 +702,8 @@ exaCreateScreenResources(ScreenPtr pScreen)
} }
static void static void
ExaBlockHandler(ScreenPtr pScreen, pointer pTimeout, ExaBlockHandler(ScreenPtr pScreen, void *pTimeout,
pointer pReadmask) void *pReadmask)
{ {
ExaScreenPriv(pScreen); ExaScreenPriv(pScreen);
@ -733,7 +733,7 @@ ExaBlockHandler(ScreenPtr pScreen, pointer pTimeout,
static void static void
ExaWakeupHandler(ScreenPtr pScreen, unsigned long result, ExaWakeupHandler(ScreenPtr pScreen, unsigned long result,
pointer pReadmask) void *pReadmask)
{ {
ExaScreenPriv(pScreen); ExaScreenPriv(pScreen);

6
exa/exa.h
View File

@ -58,7 +58,7 @@ struct _ExaOffscreenArea {
int offset; /* aligned offset */ int offset; /* aligned offset */
int size; /* total allocation size */ int size; /* total allocation size */
unsigned last_use; unsigned last_use;
pointer privData; void *privData;
ExaOffscreenSaveProc save; ExaOffscreenSaveProc save;
@ -685,7 +685,7 @@ typedef struct _ExaDriver {
*/ */
Bool (*ModifyPixmapHeader) (PixmapPtr pPixmap, int width, int height, Bool (*ModifyPixmapHeader) (PixmapPtr pPixmap, int width, int height,
int depth, int bitsPerPixel, int devKind, int depth, int bitsPerPixel, int devKind,
pointer pPixData); void *pPixData);
/* hooks for drivers with tiling support: /* hooks for drivers with tiling support:
* driver MUST fill out new_fb_pitch with valid pitch of pixmap * driver MUST fill out new_fb_pitch with valid pitch of pixmap
@ -784,7 +784,7 @@ extern _X_EXPORT ExaOffscreenArea *exaOffscreenAlloc(ScreenPtr pScreen,
int size, int align, int size, int align,
Bool locked, Bool locked,
ExaOffscreenSaveProc save, ExaOffscreenSaveProc save,
pointer privData); void *privData);
extern _X_EXPORT ExaOffscreenArea *exaOffscreenFree(ScreenPtr pScreen, extern _X_EXPORT ExaOffscreenArea *exaOffscreenFree(ScreenPtr pScreen,
ExaOffscreenArea * area); ExaOffscreenArea * area);

2
exa/exa_classic.c
View File

@ -147,7 +147,7 @@ exaCreatePixmap_classic(ScreenPtr pScreen, int w, int h, int depth,
Bool Bool
exaModifyPixmapHeader_classic(PixmapPtr pPixmap, int width, int height, exaModifyPixmapHeader_classic(PixmapPtr pPixmap, int width, int height,
int depth, int bitsPerPixel, int devKind, int depth, int bitsPerPixel, int devKind,
pointer pPixData) void *pPixData)
{ {
ScreenPtr pScreen; ScreenPtr pScreen;
ExaScreenPrivPtr pExaScr; ExaScreenPrivPtr pExaScr;

4
exa/exa_driver.c
View File

@ -130,7 +130,7 @@ exaCreatePixmap_driver(ScreenPtr pScreen, int w, int h, int depth,
Bool Bool
exaModifyPixmapHeader_driver(PixmapPtr pPixmap, int width, int height, exaModifyPixmapHeader_driver(PixmapPtr pPixmap, int width, int height,
int depth, int bitsPerPixel, int devKind, int depth, int bitsPerPixel, int devKind,
pointer pPixData) void *pPixData)
{ {
ScreenPtr pScreen; ScreenPtr pScreen;
ExaScreenPrivPtr pExaScr; ExaScreenPrivPtr pExaScr;
@ -218,7 +218,7 @@ exaPixmapHasGpuCopy_driver(PixmapPtr pPixmap)
ScreenPtr pScreen = pPixmap->drawable.pScreen; ScreenPtr pScreen = pPixmap->drawable.pScreen;
ExaScreenPriv(pScreen); ExaScreenPriv(pScreen);
pointer saved_ptr; void *saved_ptr;
Bool ret; Bool ret;
saved_ptr = pPixmap->devPrivate.ptr; saved_ptr = pPixmap->devPrivate.ptr;

8
exa/exa_glyphs.c
View File

@ -127,7 +127,7 @@ exaUnrealizeGlyphCaches(ScreenPtr pScreen, unsigned int format)
continue; continue;
if (cache->picture) { if (cache->picture) {
FreePicture((pointer) cache->picture, (XID) 0); FreePicture((void *) cache->picture, (XID) 0);
cache->picture = NULL; cache->picture = NULL;
} }
@ -225,7 +225,7 @@ exaRealizeGlyphCaches(ScreenPtr pScreen, unsigned int format)
} }
/* Each cache references the picture individually */ /* Each cache references the picture individually */
FreePicture((pointer) pPicture, (XID) 0); FreePicture((void *) pPicture, (XID) 0);
return TRUE; return TRUE;
bail: bail:
@ -737,7 +737,7 @@ exaGlyphs(CARD8 op,
/* The driver can't seem to composite to a8, let's try argb (but /* The driver can't seem to composite to a8, let's try argb (but
* without component-alpha) */ * without component-alpha) */
FreePicture((pointer) pMask, (XID) 0); FreePicture((void *) pMask, (XID) 0);
argbFormat = PictureMatchFormat(pScreen, 32, PICT_a8r8g8b8); argbFormat = PictureMatchFormat(pScreen, 32, PICT_a8r8g8b8);
@ -833,7 +833,7 @@ exaGlyphs(CARD8 op,
pDst, pDst,
xSrc + x - first_xOff, xSrc + x - first_xOff,
ySrc + y - first_yOff, 0, 0, x, y, width, height); ySrc + y - first_yOff, 0, 0, x, y, width, height);
FreePicture((pointer) pMask, (XID) 0); FreePicture((void *) pMask, (XID) 0);
(*pScreen->DestroyPixmap) (pMaskPixmap); (*pScreen->DestroyPixmap) (pMaskPixmap);
} }
} }

8
exa/exa_migration_classic.c
View File

@ -350,7 +350,7 @@ exaDoMoveInPixmap(ExaMigrationPtr migrate)
pExaPixmap->area = pExaPixmap->area =
exaOffscreenAlloc(pScreen, pExaPixmap->fb_size, exaOffscreenAlloc(pScreen, pExaPixmap->fb_size,
pExaScr->info->pixmapOffsetAlign, FALSE, pExaScr->info->pixmapOffsetAlign, FALSE,
exaPixmapSave, (pointer) pPixmap); exaPixmapSave, (void *) pPixmap);
if (pExaPixmap->area == NULL) if (pExaPixmap->area == NULL)
return; return;
@ -465,12 +465,12 @@ exaMigrateTowardFb(ExaMigrationPtr migrate)
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED) { if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED) {
DBG_MIGRATE(("UseScreen: not migrating pinned pixmap %p\n", DBG_MIGRATE(("UseScreen: not migrating pinned pixmap %p\n",
(pointer) pPixmap)); (void *) pPixmap));
return; return;
} }
DBG_MIGRATE(("UseScreen %p score %d\n", DBG_MIGRATE(("UseScreen %p score %d\n",
(pointer) pPixmap, pExaPixmap->score)); (void *) pPixmap, pExaPixmap->score));
if (pExaPixmap->score == EXA_PIXMAP_SCORE_INIT) { if (pExaPixmap->score == EXA_PIXMAP_SCORE_INIT) {
exaDoMoveInPixmap(migrate); exaDoMoveInPixmap(migrate);
@ -504,7 +504,7 @@ exaMigrateTowardSys(ExaMigrationPtr migrate)
ExaPixmapPriv(pPixmap); ExaPixmapPriv(pPixmap);
DBG_MIGRATE(("UseMem: %p score %d\n", (pointer) pPixmap, DBG_MIGRATE(("UseMem: %p score %d\n", (void *) pPixmap,
pExaPixmap->score)); pExaPixmap->score));
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED) if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)

4
exa/exa_mixed.c
View File

@ -125,7 +125,7 @@ exaCreatePixmap_mixed(ScreenPtr pScreen, int w, int h, int depth,
Bool Bool
exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth, exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth,
int bitsPerPixel, int devKind, pointer pPixData) int bitsPerPixel, int devKind, void *pPixData)
{ {
ScreenPtr pScreen; ScreenPtr pScreen;
ExaScreenPrivPtr pExaScr; ExaScreenPrivPtr pExaScr;
@ -282,7 +282,7 @@ exaPixmapHasGpuCopy_mixed(PixmapPtr pPixmap)
ExaScreenPriv(pScreen); ExaScreenPriv(pScreen);
ExaPixmapPriv(pPixmap); ExaPixmapPriv(pPixmap);
pointer saved_ptr; void *saved_ptr;
Bool ret; Bool ret;
if (!pExaPixmap->driverPriv) if (!pExaPixmap->driverPriv)

2
exa/exa_offscreen.c
View File

@ -160,7 +160,7 @@ exaFindAreaToEvict(ExaScreenPrivPtr pExaScr, int size, int align)
*/ */
ExaOffscreenArea * ExaOffscreenArea *
exaOffscreenAlloc(ScreenPtr pScreen, int size, int align, exaOffscreenAlloc(ScreenPtr pScreen, int size, int align,
Bool locked, ExaOffscreenSaveProc save, pointer privData) Bool locked, ExaOffscreenSaveProc save, void *privData)
{ {
ExaOffscreenArea *area; ExaOffscreenArea *area;

10
exa/exa_priv.h
View File

@ -430,13 +430,13 @@ void
ExaCheckImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, ExaCheckImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph, int x, int y, unsigned int nglyph,
CharInfoPtr * ppci, pointer pglyphBase); CharInfoPtr * ppci, void *pglyphBase);
void void
ExaCheckPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, ExaCheckPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph, int x, int y, unsigned int nglyph,
CharInfoPtr * ppci, pointer pglyphBase); CharInfoPtr * ppci, void *pglyphBase);
void void
@ -609,7 +609,7 @@ Bool
exaModifyPixmapHeader_classic(PixmapPtr pPixmap, int width, int height, exaModifyPixmapHeader_classic(PixmapPtr pPixmap, int width, int height,
int depth, int bitsPerPixel, int devKind, int depth, int bitsPerPixel, int devKind,
pointer pPixData); void *pPixData);
Bool Bool
exaDestroyPixmap_classic(PixmapPtr pPixmap); exaDestroyPixmap_classic(PixmapPtr pPixmap);
@ -627,7 +627,7 @@ Bool
exaModifyPixmapHeader_driver(PixmapPtr pPixmap, int width, int height, exaModifyPixmapHeader_driver(PixmapPtr pPixmap, int width, int height,
int depth, int bitsPerPixel, int devKind, int depth, int bitsPerPixel, int devKind,
pointer pPixData); void *pPixData);
Bool Bool
exaDestroyPixmap_driver(PixmapPtr pPixmap); exaDestroyPixmap_driver(PixmapPtr pPixmap);
@ -644,7 +644,7 @@ exaCreatePixmap_mixed(ScreenPtr pScreen, int w, int h, int depth,
Bool Bool
exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth, exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth,
int bitsPerPixel, int devKind, pointer pPixData); int bitsPerPixel, int devKind, void *pPixData);
Bool Bool
exaDestroyPixmap_mixed(PixmapPtr pPixmap); exaDestroyPixmap_mixed(PixmapPtr pPixmap);

4
exa/exa_unaccel.c
View File

@ -319,7 +319,7 @@ ExaCheckPolyFillRect(DrawablePtr pDrawable, GCPtr pGC,
void void
ExaCheckImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, ExaCheckImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph, int x, int y, unsigned int nglyph,
CharInfoPtr * ppci, pointer pglyphBase) CharInfoPtr * ppci, void *pglyphBase)
{ {
EXA_PRE_FALLBACK_GC(pGC); EXA_PRE_FALLBACK_GC(pGC);
EXA_FALLBACK(("to %p (%c)\n", pDrawable, exaDrawableLocation(pDrawable))); EXA_FALLBACK(("to %p (%c)\n", pDrawable, exaDrawableLocation(pDrawable)));
@ -334,7 +334,7 @@ ExaCheckImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
void void
ExaCheckPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, ExaCheckPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph, int x, int y, unsigned int nglyph,
CharInfoPtr * ppci, pointer pglyphBase) CharInfoPtr * ppci, void *pglyphBase)
{ {
EXA_PRE_FALLBACK_GC(pGC); EXA_PRE_FALLBACK_GC(pGC);
EXA_FALLBACK(("to %p (%c), style %d alu %d\n", pDrawable, EXA_FALLBACK(("to %p (%c), style %d alu %d\n", pDrawable,

16
fb/fb.h
View File

@ -776,7 +776,7 @@ fb24_32ModifyPixmapHeader(PixmapPtr pPixmap,
int width, int width,
int height, int height,
int depth, int depth,
int bitsPerPixel, int devKind, pointer pPixData); int bitsPerPixel, int devKind, void *pPixData);
/* /*
* fballpriv.c * fballpriv.c
@ -1229,7 +1229,7 @@ fbPolyGlyphBlt(DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int x, int x,
int y, int y,
unsigned int nglyph, CharInfoPtr * ppci, pointer pglyphBase); unsigned int nglyph, CharInfoPtr * ppci, void *pglyphBase);
extern _X_EXPORT void extern _X_EXPORT void
@ -1237,7 +1237,7 @@ fbImageGlyphBlt(DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int x, int x,
int y, int y,
unsigned int nglyph, CharInfoPtr * ppci, pointer pglyphBase); unsigned int nglyph, CharInfoPtr * ppci, void *pglyphBase);
/* /*
* fbimage.c * fbimage.c
@ -1409,7 +1409,7 @@ extern _X_EXPORT void
_fbSetWindowPixmap(WindowPtr pWindow, PixmapPtr pPixmap); _fbSetWindowPixmap(WindowPtr pWindow, PixmapPtr pPixmap);
extern _X_EXPORT Bool extern _X_EXPORT Bool
fbSetupScreen(ScreenPtr pScreen, pointer pbits, /* pointer to screen bitmap */ fbSetupScreen(ScreenPtr pScreen, void *pbits, /* pointer to screen bitmap */
int xsize, /* in pixels */ int xsize, /* in pixels */
int ysize, int dpix, /* dots per inch */ int ysize, int dpix, /* dots per inch */
int dpiy, int width, /* pixel width of frame buffer */ int dpiy, int width, /* pixel width of frame buffer */
@ -1418,7 +1418,7 @@ extern _X_EXPORT Bool
extern _X_EXPORT Bool extern _X_EXPORT Bool
wfbFinishScreenInit(ScreenPtr pScreen, wfbFinishScreenInit(ScreenPtr pScreen,
pointer pbits, void *pbits,
int xsize, int xsize,
int ysize, int ysize,
int dpix, int dpix,
@ -1430,7 +1430,7 @@ wfbFinishScreenInit(ScreenPtr pScreen,
extern _X_EXPORT Bool extern _X_EXPORT Bool
wfbScreenInit(ScreenPtr pScreen, wfbScreenInit(ScreenPtr pScreen,
pointer pbits, void *pbits,
int xsize, int xsize,
int ysize, int ysize,
int dpix, int dpix,
@ -1442,14 +1442,14 @@ wfbScreenInit(ScreenPtr pScreen,
extern _X_EXPORT Bool extern _X_EXPORT Bool
fbFinishScreenInit(ScreenPtr pScreen, fbFinishScreenInit(ScreenPtr pScreen,
pointer pbits, void *pbits,
int xsize, int xsize,
int ysize, int dpix, int dpiy, int width, int bpp); int ysize, int dpix, int dpiy, int width, int bpp);
extern _X_EXPORT Bool extern _X_EXPORT Bool
fbScreenInit(ScreenPtr pScreen, fbScreenInit(ScreenPtr pScreen,
pointer pbits, void *pbits,
int xsize, int ysize, int dpix, int dpiy, int width, int bpp); int xsize, int ysize, int dpix, int dpiy, int width, int bpp);
/* /*

4
fb/fb24_32.c
View File

@ -495,7 +495,7 @@ fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel)
} }
typedef struct { typedef struct {
pointer pbits; void *pbits;
int width; int width;
} miScreenInitParmsRec, *miScreenInitParmsPtr; } miScreenInitParmsRec, *miScreenInitParmsPtr;
@ -526,7 +526,7 @@ fb24_32ModifyPixmapHeader(PixmapPtr pPixmap,
int width, int width,
int height, int height,
int depth, int depth,
int bitsPerPixel, int devKind, pointer pPixData) int bitsPerPixel, int devKind, void *pPixData)
{ {
int bpp, w; int bpp, w;

4
fb/fb24_32.h
View File

@ -31,14 +31,14 @@
Bool Bool
fb24_32FinishScreenInit(ScreenPtr pScreen, fb24_32FinishScreenInit(ScreenPtr pScreen,
pointer pbits, void *pbits,
int xsize, int xsize,
int ysize, int dpix, int dpiy, int width, int bpp); int ysize, int dpix, int dpiy, int width, int bpp);
Bool Bool
fb24_32ScreenInit(ScreenPtr pScreen, fb24_32ScreenInit(ScreenPtr pScreen,
pointer pbits, void *pbits,
int xsize, int ysize, int dpix, int dpiy, int width, int bpp); int xsize, int ysize, int dpix, int dpiy, int width, int bpp);
#endif #endif

4
fb/fbglyph.c
View File

@ -241,7 +241,7 @@ fbPolyGlyphBlt(DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int x, int x,
int y, int y,
unsigned int nglyph, CharInfoPtr * ppci, pointer pglyphBase) unsigned int nglyph, CharInfoPtr * ppci, void *pglyphBase)
{ {
FbGCPrivPtr pPriv = fbGetGCPrivate(pGC); FbGCPrivPtr pPriv = fbGetGCPrivate(pGC);
CharInfoPtr pci; CharInfoPtr pci;
@ -309,7 +309,7 @@ fbImageGlyphBlt(DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int x, int x,
int y, int y,
unsigned int nglyph, CharInfoPtr * ppciInit, pointer pglyphBase) unsigned int nglyph, CharInfoPtr * ppciInit, void *pglyphBase)
{ {
FbGCPrivPtr pPriv = fbGetGCPrivate(pGC); FbGCPrivPtr pPriv = fbGetGCPrivate(pGC);
CharInfoPtr *ppci; CharInfoPtr *ppci;

12
fb/fboverlay.c
View File

@ -104,7 +104,7 @@ fbOverlayWindowLayer(WindowPtr pWin)
for (i = 0; i < pScrPriv->nlayers; i++) for (i = 0; i < pScrPriv->nlayers; i++)
if (dixLookupPrivate(&pWin->devPrivates, fbGetWinPrivateKey(pWin)) == if (dixLookupPrivate(&pWin->devPrivates, fbGetWinPrivateKey(pWin)) ==
(pointer) pScrPriv->layer[i].u.run.pixmap) (void *) pScrPriv->layer[i].u.run.pixmap)
return i; return i;
return 0; return 0;
} }
@ -115,7 +115,7 @@ fbOverlayCreateScreenResources(ScreenPtr pScreen)
int i; int i;
FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pScreen); FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pScreen);
PixmapPtr pPixmap; PixmapPtr pPixmap;
pointer pbits; void *pbits;
int width; int width;
int depth; int depth;
BoxRec box; BoxRec box;
@ -250,8 +250,8 @@ fbOverlayWindowExposures(WindowPtr pWin,
Bool Bool
fbOverlaySetupScreen(ScreenPtr pScreen, fbOverlaySetupScreen(ScreenPtr pScreen,
pointer pbits1, void *pbits1,
pointer pbits2, void *pbits2,
int xsize, int xsize,
int ysize, int ysize,
int dpix, int dpix,
@ -287,8 +287,8 @@ fb24_32OverlayCreateScreenResources(ScreenPtr pScreen)
Bool Bool
fbOverlayFinishScreenInit(ScreenPtr pScreen, fbOverlayFinishScreenInit(ScreenPtr pScreen,
pointer pbits1, void *pbits1,
pointer pbits2, void *pbits2,
int xsize, int xsize,
int ysize, int ysize,
int dpix, int dpix,

10
fb/fboverlay.h
View File

@ -38,7 +38,7 @@ typedef void (*fbOverlayPaintKeyProc) (DrawablePtr, RegionPtr, CARD32, int);
typedef struct _fbOverlayLayer { typedef struct _fbOverlayLayer {
union { union {
struct { struct {
pointer pbits; void *pbits;
int width; int width;
int depth; int depth;
} init; } init;
@ -89,8 +89,8 @@ fbOverlayWindowExposures(WindowPtr pWin,
extern _X_EXPORT Bool extern _X_EXPORT Bool
fbOverlaySetupScreen(ScreenPtr pScreen, fbOverlaySetupScreen(ScreenPtr pScreen,
pointer pbits1, void *pbits1,
pointer pbits2, void *pbits2,
int xsize, int xsize,
int ysize, int ysize,
int dpix, int dpix,
@ -99,8 +99,8 @@ fbOverlaySetupScreen(ScreenPtr pScreen,
extern _X_EXPORT Bool extern _X_EXPORT Bool
fbOverlayFinishScreenInit(ScreenPtr pScreen, fbOverlayFinishScreenInit(ScreenPtr pScreen,
pointer pbits1, void *pbits1,
pointer pbits2, void *pbits2,
int xsize, int xsize,
int ysize, int ysize,
int dpix, int dpix,

2
fb/fbpixmap.c
View File

@ -66,7 +66,7 @@ fbCreatePixmapBpp(ScreenPtr pScreen, int width, int height, int depth, int bpp,
pPixmap->drawable.height = height; pPixmap->drawable.height = height;
pPixmap->devKind = paddedWidth; pPixmap->devKind = paddedWidth;
pPixmap->refcnt = 1; pPixmap->refcnt = 1;
pPixmap->devPrivate.ptr = (pointer) ((char *) pPixmap + base + adjust); pPixmap->devPrivate.ptr = (void *) ((char *) pPixmap + base + adjust);
pPixmap->master_pixmap = NULL; pPixmap->master_pixmap = NULL;
#ifdef FB_DEBUG #ifdef FB_DEBUG

10
fb/fbscreen.c
View File

@ -90,7 +90,7 @@ _fbSetWindowPixmap(WindowPtr pWindow, PixmapPtr pPixmap)
} }
Bool Bool
fbSetupScreen(ScreenPtr pScreen, pointer pbits, /* pointer to screen bitmap */ fbSetupScreen(ScreenPtr pScreen, void *pbits, /* pointer to screen bitmap */
int xsize, /* in pixels */ int xsize, /* in pixels */
int ysize, int dpix, /* dots per inch */ int ysize, int dpix, /* dots per inch */
int dpiy, int width, /* pixel width of frame buffer */ int dpiy, int width, /* pixel width of frame buffer */
@ -135,7 +135,7 @@ fbSetupScreen(ScreenPtr pScreen, pointer pbits, /* pointer to screen bitmap */
#ifdef FB_ACCESS_WRAPPER #ifdef FB_ACCESS_WRAPPER
Bool Bool
wfbFinishScreenInit(ScreenPtr pScreen, wfbFinishScreenInit(ScreenPtr pScreen,
pointer pbits, void *pbits,
int xsize, int xsize,
int ysize, int ysize,
int dpix, int dpix,
@ -146,7 +146,7 @@ wfbFinishScreenInit(ScreenPtr pScreen,
#else #else
Bool Bool
fbFinishScreenInit(ScreenPtr pScreen, fbFinishScreenInit(ScreenPtr pScreen,
pointer pbits, void *pbits,
int xsize, int ysize, int dpix, int dpiy, int width, int bpp) int xsize, int ysize, int dpix, int dpiy, int width, int bpp)
#endif #endif
{ {
@ -224,7 +224,7 @@ fbFinishScreenInit(ScreenPtr pScreen,
#ifdef FB_ACCESS_WRAPPER #ifdef FB_ACCESS_WRAPPER
Bool Bool
wfbScreenInit(ScreenPtr pScreen, wfbScreenInit(ScreenPtr pScreen,
pointer pbits, void *pbits,
int xsize, int xsize,
int ysize, int ysize,
int dpix, int dpix,
@ -242,7 +242,7 @@ wfbScreenInit(ScreenPtr pScreen,
#else #else
Bool Bool
fbScreenInit(ScreenPtr pScreen, fbScreenInit(ScreenPtr pScreen,
pointer pbits, void *pbits,
int xsize, int ysize, int dpix, int dpiy, int width, int bpp) int xsize, int ysize, int dpix, int dpiy, int width, int bpp)
{ {
if (!fbSetupScreen(pScreen, pbits, xsize, ysize, dpix, dpiy, width, bpp)) if (!fbSetupScreen(pScreen, pbits, xsize, ysize, dpix, dpiy, width, bpp))

6
glx/glxcmds.c
View File

@ -133,7 +133,7 @@ _X_HIDDEN int
validGlxContext(ClientPtr client, XID id, int access_mode, validGlxContext(ClientPtr client, XID id, int access_mode,
__GLXcontext ** context, int *err) __GLXcontext ** context, int *err)
{ {
*err = dixLookupResourceByType((pointer *) context, id, *err = dixLookupResourceByType((void **) context, id,
__glXContextRes, client, access_mode); __glXContextRes, client, access_mode);
if (*err != Success || (*context)->idExists == GL_FALSE) { if (*err != Success || (*context)->idExists == GL_FALSE) {
client->errorValue = id; client->errorValue = id;
@ -151,7 +151,7 @@ validGlxDrawable(ClientPtr client, XID id, int type, int access_mode,
{ {
int rc; int rc;
rc = dixLookupResourceByType((pointer *) drawable, id, rc = dixLookupResourceByType((void **) drawable, id,
__glXDrawableRes, client, access_mode); __glXDrawableRes, client, access_mode);
if (rc != Success && rc != BadValue) { if (rc != Success && rc != BadValue) {
*err = rc; *err = rc;
@ -2507,7 +2507,7 @@ __glXpresentCompleteNotify(WindowPtr window, CARD8 present_mode, CARD32 serial,
int glx_type; int glx_type;
int rc; int rc;
rc = dixLookupResourceByType((pointer *) &drawable, window->drawable.id, rc = dixLookupResourceByType((void **) &drawable, window->drawable.id,
__glXDrawableRes, serverClient, DixGetAttrAccess); __glXDrawableRes, serverClient, DixGetAttrAccess);
if (rc != Success) if (rc != Success)

4
glx/glxext.c
View File

@ -164,7 +164,7 @@ __glXAddContext(__GLXcontext * cx)
{ {
/* Register this context as a resource. /* Register this context as a resource.
*/ */
if (!AddResource(cx->id, __glXContextRes, (pointer)cx)) { if (!AddResource(cx->id, __glXContextRes, (void *)cx)) {
return False; return False;
} }
@ -278,7 +278,7 @@ glxGetClient(ClientPtr pClient)
} }
static void static void
glxClientCallback(CallbackListPtr *list, pointer closure, pointer data) glxClientCallback(CallbackListPtr *list, void *closure, void *data)
{ {
NewClientInfoRec *clientinfo = (NewClientInfoRec *) data; NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
ClientPtr pClient = clientinfo->client; ClientPtr pClient = clientinfo->client;

4
hw/dmx/dmx.c
View File

@ -268,7 +268,7 @@ ProcDMXForceWindowCreation(ClientPtr client)
PanoramiXRes *win; PanoramiXRes *win;
int i; int i;
if (Success != dixLookupResourceByType((pointer *) &win, if (Success != dixLookupResourceByType((void **) &win,
stuff->window, XRT_WINDOW, stuff->window, XRT_WINDOW,
client, DixReadAccess)) client, DixReadAccess))
return -1; /* BadWindow */ return -1; /* BadWindow */
@ -556,7 +556,7 @@ dmxPopulatePanoramiX(ClientPtr client, Window window,
int count = 0; int count = 0;
DMXWindowAttributesRec attr; DMXWindowAttributesRec attr;
if (Success != dixLookupResourceByType((pointer *) &win, if (Success != dixLookupResourceByType((void **) &win,
window, XRT_WINDOW, window, XRT_WINDOW,
client, DixReadAccess)) client, DixReadAccess))
return -1; /* BadWindow */ return -1; /* BadWindow */

32
hw/dmx/dmxextension.c
View File

@ -728,7 +728,7 @@ static Bool FoundPixImage;
* another screen with the same image. If so, copy the pixmap image * another screen with the same image. If so, copy the pixmap image
* from the existing screen to the newly created pixmap. */ * from the existing screen to the newly created pixmap. */
static void static void
dmxBERestorePixmapImage(pointer value, XID id, RESTYPE type, pointer p) dmxBERestorePixmapImage(void *value, XID id, RESTYPE type, void *p)
{ {
if ((type & TypeMask) == (XRT_PIXMAP & TypeMask)) { if ((type & TypeMask) == (XRT_PIXMAP & TypeMask)) {
PixmapPtr pDst = (PixmapPtr) p; PixmapPtr pDst = (PixmapPtr) p;
@ -737,7 +737,7 @@ dmxBERestorePixmapImage(pointer value, XID id, RESTYPE type, pointer p)
PixmapPtr pPix; PixmapPtr pPix;
int i; int i;
dixLookupResourceByType((pointer *) &pPix, pXinPix->info[idx].id, dixLookupResourceByType((void **) &pPix, pXinPix->info[idx].id,
RT_PIXMAP, NullClient, DixUnknownAccess); RT_PIXMAP, NullClient, DixUnknownAccess);
if (pPix != pDst) if (pPix != pDst)
return; /* Not a match.... Next! */ return; /* Not a match.... Next! */
@ -749,7 +749,7 @@ dmxBERestorePixmapImage(pointer value, XID id, RESTYPE type, pointer p)
if (i == idx) if (i == idx)
continue; /* Self replication is bad */ continue; /* Self replication is bad */
dixLookupResourceByType((pointer *) &pSrc, pXinPix->info[i].id, dixLookupResourceByType((void **) &pSrc, pXinPix->info[i].id,
RT_PIXMAP, NullClient, DixUnknownAccess); RT_PIXMAP, NullClient, DixUnknownAccess);
pSrcPriv = DMX_GET_PIXMAP_PRIV(pSrc); pSrcPriv = DMX_GET_PIXMAP_PRIV(pSrc);
if (pSrcPriv->pixmap) { if (pSrcPriv->pixmap) {
@ -828,7 +828,7 @@ dmxBERestorePixmap(PixmapPtr pPixmap)
for (i = currentMaxClients; --i >= 0;) for (i = currentMaxClients; --i >= 0;)
if (clients[i]) if (clients[i])
FindAllClientResources(clients[i], dmxBERestorePixmapImage, FindAllClientResources(clients[i], dmxBERestorePixmapImage,
(pointer) pPixmap); (void *) pPixmap);
/* No corresponding pixmap image was found on other screens, so we /* No corresponding pixmap image was found on other screens, so we
* need to copy it from the saved image when the screen was detached * need to copy it from the saved image when the screen was detached
@ -895,7 +895,7 @@ dmxBERestorePixmap(PixmapPtr pPixmap)
* number passed in as \a n and calls the appropriate DMX function to * number passed in as \a n and calls the appropriate DMX function to
* create the associated resource on the back-end server. */ * create the associated resource on the back-end server. */
static void static void
dmxBECreateResources(pointer value, XID id, RESTYPE type, pointer n) dmxBECreateResources(void *value, XID id, RESTYPE type, void *n)
{ {
int scrnNum = (uintptr_t) n; int scrnNum = (uintptr_t) n;
ScreenPtr pScreen = screenInfo.screens[scrnNum]; ScreenPtr pScreen = screenInfo.screens[scrnNum];
@ -1121,7 +1121,7 @@ dmxCompareScreens(DMXScreenInfo * new, DMXScreenInfo * old)
/** Restore Render's picture */ /** Restore Render's picture */
static void static void
dmxBERestoreRenderPict(pointer value, XID id, pointer n) dmxBERestoreRenderPict(void *value, XID id, void *n)
{ {
PicturePtr pPicture = value; /* The picture */ PicturePtr pPicture = value; /* The picture */
DrawablePtr pDraw = pPicture->pDrawable; /* The picture's drawable */ DrawablePtr pDraw = pPicture->pDrawable; /* The picture's drawable */
@ -1145,7 +1145,7 @@ dmxBERestoreRenderPict(pointer value, XID id, pointer n)
/** Restore Render's glyphs */ /** Restore Render's glyphs */
static void static void
dmxBERestoreRenderGlyph(pointer value, XID id, pointer n) dmxBERestoreRenderGlyph(void *value, XID id, void *n)
{ {
GlyphSetPtr glyphSet = value; GlyphSetPtr glyphSet = value;
int scrnNum = (uintptr_t) n; int scrnNum = (uintptr_t) n;
@ -1340,7 +1340,7 @@ dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
for (i = currentMaxClients; --i >= 0;) for (i = currentMaxClients; --i >= 0;)
if (clients[i]) if (clients[i])
FindAllClientResources(clients[i], dmxBECreateResources, FindAllClientResources(clients[i], dmxBECreateResources,
(pointer) (uintptr_t) idx); (void *) (uintptr_t) idx);
/* Create window hierarchy (top down) */ /* Create window hierarchy (top down) */
dmxBECreateWindowTree(idx); dmxBECreateWindowTree(idx);
@ -1350,14 +1350,14 @@ dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
if (clients[i]) if (clients[i])
FindClientResourcesByType(clients[i], PictureType, FindClientResourcesByType(clients[i], PictureType,
dmxBERestoreRenderPict, dmxBERestoreRenderPict,
(pointer) (uintptr_t) idx); (void *) (uintptr_t) idx);
/* Restore the glyph state for RENDER */ /* Restore the glyph state for RENDER */
for (i = currentMaxClients; --i >= 0;) for (i = currentMaxClients; --i >= 0;)
if (clients[i]) if (clients[i])
FindClientResourcesByType(clients[i], GlyphSetType, FindClientResourcesByType(clients[i], GlyphSetType,
dmxBERestoreRenderGlyph, dmxBERestoreRenderGlyph,
(pointer) (uintptr_t) idx); (void *) (uintptr_t) idx);
/* Refresh screen by generating exposure events for all windows */ /* Refresh screen by generating exposure events for all windows */
dmxForceExposures(idx); dmxForceExposures(idx);
@ -1425,7 +1425,7 @@ dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
/** Search the Xinerama XRT_PIXMAP resources for the pixmap that needs /** Search the Xinerama XRT_PIXMAP resources for the pixmap that needs
* to have its image saved. */ * to have its image saved. */
static void static void
dmxBEFindPixmapImage(pointer value, XID id, RESTYPE type, pointer p) dmxBEFindPixmapImage(void *value, XID id, RESTYPE type, void *p)
{ {
if ((type & TypeMask) == (XRT_PIXMAP & TypeMask)) { if ((type & TypeMask) == (XRT_PIXMAP & TypeMask)) {
PixmapPtr pDst = (PixmapPtr) p; PixmapPtr pDst = (PixmapPtr) p;
@ -1434,7 +1434,7 @@ dmxBEFindPixmapImage(pointer value, XID id, RESTYPE type, pointer p)
PixmapPtr pPix; PixmapPtr pPix;
int i; int i;
dixLookupResourceByType((pointer *) &pPix, pXinPix->info[idx].id, dixLookupResourceByType((void **) &pPix, pXinPix->info[idx].id,
RT_PIXMAP, NullClient, DixUnknownAccess); RT_PIXMAP, NullClient, DixUnknownAccess);
if (pPix != pDst) if (pPix != pDst)
return; /* Not a match.... Next! */ return; /* Not a match.... Next! */
@ -1446,7 +1446,7 @@ dmxBEFindPixmapImage(pointer value, XID id, RESTYPE type, pointer p)
if (i == idx) if (i == idx)
continue; /* Self replication is bad */ continue; /* Self replication is bad */
dixLookupResourceByType((pointer *) &pSrc, pXinPix->info[i].id, dixLookupResourceByType((void **) &pSrc, pXinPix->info[i].id,
RT_PIXMAP, NullClient, DixUnknownAccess); RT_PIXMAP, NullClient, DixUnknownAccess);
pSrcPriv = DMX_GET_PIXMAP_PRIV(pSrc); pSrcPriv = DMX_GET_PIXMAP_PRIV(pSrc);
if (pSrcPriv->pixmap) { if (pSrcPriv->pixmap) {
@ -1482,7 +1482,7 @@ dmxBESavePixmap(PixmapPtr pPixmap)
for (i = currentMaxClients; --i >= 0;) for (i = currentMaxClients; --i >= 0;)
if (clients[i]) if (clients[i])
FindAllClientResources(clients[i], dmxBEFindPixmapImage, FindAllClientResources(clients[i], dmxBEFindPixmapImage,
(pointer) pPixmap); (void *) pPixmap);
/* Save the image only if there is no other screens that have a /* Save the image only if there is no other screens that have a
* pixmap that corresponds to the one we are trying to save. */ * pixmap that corresponds to the one we are trying to save. */
@ -1522,7 +1522,7 @@ dmxBESavePixmap(PixmapPtr pPixmap)
* number passed in as \a n and calls the appropriate DMX function to * number passed in as \a n and calls the appropriate DMX function to
* free the associated resource on the back-end server. */ * free the associated resource on the back-end server. */
static void static void
dmxBEDestroyResources(pointer value, XID id, RESTYPE type, pointer n) dmxBEDestroyResources(void *value, XID id, RESTYPE type, void *n)
{ {
int scrnNum = (uintptr_t) n; int scrnNum = (uintptr_t) n;
ScreenPtr pScreen = screenInfo.screens[scrnNum]; ScreenPtr pScreen = screenInfo.screens[scrnNum];
@ -1683,7 +1683,7 @@ dmxDetachScreen(int idx)
for (i = currentMaxClients; --i >= 0;) for (i = currentMaxClients; --i >= 0;)
if (clients[i]) if (clients[i])
FindAllClientResources(clients[i], dmxBEDestroyResources, FindAllClientResources(clients[i], dmxBEDestroyResources,
(pointer) (uintptr_t) idx); (void *) (uintptr_t) idx);
/* Free scratch GCs */ /* Free scratch GCs */
dmxBEDestroyScratchGCs(idx); dmxBEDestroyScratchGCs(idx);

2
hw/dmx/dmxfont.c
View File

@ -460,7 +460,7 @@ dmxRealizeFont(ScreenPtr pScreen, FontPtr pFont)
pFontPriv->refcnt = 0; pFontPriv->refcnt = 0;
} }
FontSetPrivate(pFont, dmxFontPrivateIndex, (pointer) pFontPriv); FontSetPrivate(pFont, dmxFontPrivateIndex, (void *) pFontPriv);
if (dmxScreen->beDisplay) { if (dmxScreen->beDisplay) {
if (!dmxBELoadFont(pScreen, pFont)) if (!dmxBELoadFont(pScreen, pFont))

2
hw/dmx/dmxgc.c
View File

@ -378,7 +378,7 @@ dmxDestroyGC(GCPtr pGC)
/** Change the clip rects for a GC. */ /** Change the clip rects for a GC. */
void void
dmxChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects) dmxChangeClip(GCPtr pGC, int type, void *pvalue, int nrects)
{ {
ScreenPtr pScreen = pGC->pScreen; ScreenPtr pScreen = pGC->pScreen;
DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum]; DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

2
hw/dmx/dmxgc.h
View File

@ -55,7 +55,7 @@ extern void dmxValidateGC(GCPtr pGC, unsigned long changes,
extern void dmxChangeGC(GCPtr pGC, unsigned long mask); extern void dmxChangeGC(GCPtr pGC, unsigned long mask);
extern void dmxCopyGC(GCPtr pGCSrc, unsigned long changes, GCPtr pGCDst); extern void dmxCopyGC(GCPtr pGCSrc, unsigned long changes, GCPtr pGCDst);
extern void dmxDestroyGC(GCPtr pGC); extern void dmxDestroyGC(GCPtr pGC);
extern void dmxChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects); extern void dmxChangeClip(GCPtr pGC, int type, void *pvalue, int nrects);
extern void dmxDestroyClip(GCPtr pGC); extern void dmxDestroyClip(GCPtr pGC);
extern void dmxCopyClip(GCPtr pGCDst, GCPtr pGCSrc); extern void dmxCopyClip(GCPtr pGCDst, GCPtr pGCSrc);

8
hw/dmx/dmxgcops.c
View File

@ -508,7 +508,7 @@ dmxImageText16(DrawablePtr pDrawable, GCPtr pGC,
void void
dmxImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, dmxImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph, int x, int y, unsigned int nglyph,
CharInfoPtr * ppci, pointer pglyphBase) CharInfoPtr * ppci, void *pglyphBase)
{ {
/* Error -- this should never happen! */ /* Error -- this should never happen! */
} }
@ -517,7 +517,7 @@ dmxImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
void void
dmxPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, dmxPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph, int x, int y, unsigned int nglyph,
CharInfoPtr * ppci, pointer pglyphBase) CharInfoPtr * ppci, void *pglyphBase)
{ {
/* Error -- this should never happen! */ /* Error -- this should never happen! */
} }
@ -551,7 +551,7 @@ dmxFindAlternatePixmap(DrawablePtr pDrawable, XID *draw)
if (pDrawable->type != DRAWABLE_PIXMAP) if (pDrawable->type != DRAWABLE_PIXMAP)
return NULL; return NULL;
if (Success != dixLookupResourceByType((pointer *) &pXinPix, if (Success != dixLookupResourceByType((void **) &pXinPix,
pDrawable->id, XRT_PIXMAP, pDrawable->id, XRT_PIXMAP,
NullClient, DixUnknownAccess)) NullClient, DixUnknownAccess))
return NULL; return NULL;
@ -562,7 +562,7 @@ dmxFindAlternatePixmap(DrawablePtr pDrawable, XID *draw)
PixmapPtr pSrc; PixmapPtr pSrc;
dmxPixPrivPtr pSrcPriv; dmxPixPrivPtr pSrcPriv;
dixLookupResourceByType((pointer *) &pSrc, pXinPix->info[i].id, dixLookupResourceByType((void **) &pSrc, pXinPix->info[i].id,
RT_PIXMAP, NullClient, DixUnknownAccess); RT_PIXMAP, NullClient, DixUnknownAccess);
pSrcPriv = DMX_GET_PIXMAP_PRIV(pSrc); pSrcPriv = DMX_GET_PIXMAP_PRIV(pSrc);
if (pSrcPriv->pixmap) { if (pSrcPriv->pixmap) {

4
hw/dmx/dmxgcops.h
View File

@ -78,10 +78,10 @@ extern void dmxImageText16(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, int count, unsigned short *chars); int x, int y, int count, unsigned short *chars);
extern void dmxImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, extern void dmxImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph, int x, int y, unsigned int nglyph,
CharInfoPtr * ppci, pointer pglyphBase); CharInfoPtr * ppci, void *pglyphBase);
extern void dmxPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, extern void dmxPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph, int x, int y, unsigned int nglyph,
CharInfoPtr * ppci, pointer pglyphBase); CharInfoPtr * ppci, void *pglyphBase);
extern void dmxPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst, extern void dmxPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst,
int w, int h, int x, int y); int w, int h, int x, int y);

20
hw/dmx/dmxpict.c
View File

@ -285,7 +285,7 @@ dmxProcRenderCreateGlyphSet(ClientPtr client)
/* Store glyphsets from backends in glyphSet->devPrivate ????? */ /* Store glyphsets from backends in glyphSet->devPrivate ????? */
/* Make sure we handle all errors here!! */ /* Make sure we handle all errors here!! */
dixLookupResourceByType((pointer *) &glyphSet, dixLookupResourceByType((void **) &glyphSet,
stuff->gsid, GlyphSetType, stuff->gsid, GlyphSetType,
client, DixDestroyAccess); client, DixDestroyAccess);
@ -332,7 +332,7 @@ dmxProcRenderFreeGlyphSet(ClientPtr client)
REQUEST(xRenderFreeGlyphSetReq); REQUEST(xRenderFreeGlyphSetReq);
REQUEST_SIZE_MATCH(xRenderFreeGlyphSetReq); REQUEST_SIZE_MATCH(xRenderFreeGlyphSetReq);
dixLookupResourceByType((pointer *) &glyphSet, dixLookupResourceByType((void **) &glyphSet,
stuff->glyphset, GlyphSetType, stuff->glyphset, GlyphSetType,
client, DixDestroyAccess); client, DixDestroyAccess);
@ -378,7 +378,7 @@ dmxProcRenderAddGlyphs(ClientPtr client)
CARD8 *bits; CARD8 *bits;
int nbytes; int nbytes;
dixLookupResourceByType((pointer *) &glyphSet, dixLookupResourceByType((void **) &glyphSet,
stuff->glyphset, GlyphSetType, stuff->glyphset, GlyphSetType,
client, DixReadAccess); client, DixReadAccess);
glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet); glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet);
@ -423,7 +423,7 @@ dmxProcRenderFreeGlyphs(ClientPtr client)
REQUEST(xRenderFreeGlyphsReq); REQUEST(xRenderFreeGlyphsReq);
REQUEST_AT_LEAST_SIZE(xRenderFreeGlyphsReq); REQUEST_AT_LEAST_SIZE(xRenderFreeGlyphsReq);
dixLookupResourceByType((pointer *) &glyphSet, dixLookupResourceByType((void **) &glyphSet,
stuff->glyphset, GlyphSetType, stuff->glyphset, GlyphSetType,
client, DixWriteAccess); client, DixWriteAccess);
@ -498,14 +498,14 @@ dmxProcRenderCompositeGlyphs(ClientPtr client)
GlyphSetPtr glyphSet; GlyphSetPtr glyphSet;
dmxGlyphPrivPtr glyphPriv; dmxGlyphPrivPtr glyphPriv;
dixLookupResourceByType((pointer *) &pSrc, dixLookupResourceByType((void **) &pSrc,
stuff->src, PictureType, client, DixReadAccess); stuff->src, PictureType, client, DixReadAccess);
pSrcPriv = DMX_GET_PICT_PRIV(pSrc); pSrcPriv = DMX_GET_PICT_PRIV(pSrc);
if (!pSrcPriv->pict) if (!pSrcPriv->pict)
return ret; return ret;
dixLookupResourceByType((pointer *) &pDst, dixLookupResourceByType((void **) &pDst,
stuff->dst, PictureType, stuff->dst, PictureType,
client, DixWriteAccess); client, DixWriteAccess);
@ -524,7 +524,7 @@ dmxProcRenderCompositeGlyphs(ClientPtr client)
return ret; return ret;
if (stuff->maskFormat) if (stuff->maskFormat)
dixLookupResourceByType((pointer *) &pFmt, dixLookupResourceByType((void **) &pFmt,
stuff->maskFormat, PictFormatType, stuff->maskFormat, PictFormatType,
client, DixReadAccess); client, DixReadAccess);
else else
@ -585,7 +585,7 @@ dmxProcRenderCompositeGlyphs(ClientPtr client)
curGlyph = glyphs; curGlyph = glyphs;
curElt = elts; curElt = elts;
dixLookupResourceByType((pointer *) &glyphSet, dixLookupResourceByType((void **) &glyphSet,
stuff->glyphset, GlyphSetType, stuff->glyphset, GlyphSetType,
client, DixReadAccess); client, DixReadAccess);
glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet); glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet);
@ -595,7 +595,7 @@ dmxProcRenderCompositeGlyphs(ClientPtr client)
buffer += sizeof(xGlyphElt); buffer += sizeof(xGlyphElt);
if (elt->len == 0xff) { if (elt->len == 0xff) {
dixLookupResourceByType((pointer *) &glyphSet, dixLookupResourceByType((void **) &glyphSet,
*((CARD32 *) buffer), *((CARD32 *) buffer),
GlyphSetType, client, DixReadAccess); GlyphSetType, client, DixReadAccess);
glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet); glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet);
@ -894,7 +894,7 @@ dmxDestroyPicture(PicturePtr pPicture)
/** Change the picture's list of clip rectangles. */ /** Change the picture's list of clip rectangles. */
int int
dmxChangePictureClip(PicturePtr pPicture, int clipType, pointer value, int n) dmxChangePictureClip(PicturePtr pPicture, int clipType, void *value, int n)
{ {
ScreenPtr pScreen = pPicture->pDrawable->pScreen; ScreenPtr pScreen = pPicture->pDrawable->pScreen;
DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum]; DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

2
hw/dmx/dmxpict.h
View File

@ -65,7 +65,7 @@ extern Bool dmxDestroyPictureList(WindowPtr pWindow);
extern int dmxCreatePicture(PicturePtr pPicture); extern int dmxCreatePicture(PicturePtr pPicture);
extern void dmxDestroyPicture(PicturePtr pPicture); extern void dmxDestroyPicture(PicturePtr pPicture);
extern int dmxChangePictureClip(PicturePtr pPicture, int clipType, extern int dmxChangePictureClip(PicturePtr pPicture, int clipType,
pointer value, int n); void *value, int n);
extern void dmxDestroyPictureClip(PicturePtr pPicture); extern void dmxDestroyPictureClip(PicturePtr pPicture);
extern void dmxChangePicture(PicturePtr pPicture, Mask mask); extern void dmxChangePicture(PicturePtr pPicture, Mask mask);
extern void dmxValidatePicture(PicturePtr pPicture, Mask mask); extern void dmxValidatePicture(PicturePtr pPicture, Mask mask);

2
hw/dmx/dmxstat.c
View File

@ -175,7 +175,7 @@ dmxStatSync(DMXScreenInfo * dmxScreen,
/* Actually do the work of printing out the human-readable message. */ /* Actually do the work of printing out the human-readable message. */
static CARD32 static CARD32
dmxStatCallback(OsTimerPtr timer, CARD32 t, pointer arg) dmxStatCallback(OsTimerPtr timer, CARD32 t, void *arg)
{ {
int i, j; int i, j;
static int header = 0; static int header = 0;

6
hw/dmx/dmxsync.c
View File

@ -82,7 +82,7 @@ dmxDoSync(DMXScreenInfo * dmxScreen)
} }
static CARD32 static CARD32
dmxSyncCallback(OsTimerPtr timer, CARD32 time, pointer arg) dmxSyncCallback(OsTimerPtr timer, CARD32 time, void *arg)
{ {
int i; int i;
@ -99,13 +99,13 @@ dmxSyncCallback(OsTimerPtr timer, CARD32 time, pointer arg)
} }
static void static void
dmxSyncBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadMask) dmxSyncBlockHandler(void *blockData, OSTimePtr pTimeout, void *pReadMask)
{ {
TimerForce(dmxSyncTimer); TimerForce(dmxSyncTimer);
} }
static void static void
dmxSyncWakeupHandler(pointer blockData, int result, pointer pReadMask) dmxSyncWakeupHandler(void *blockData, int result, void *pReadMask)
{ {
} }

6
hw/dmx/dmxwindow.c
View File

@ -86,7 +86,7 @@ dmxCreateRootWindow(WindowPtr pWindow)
parent = dmxScreen->scrnWin; /* This is our "Screen" window */ parent = dmxScreen->scrnWin; /* This is our "Screen" window */
visual = dmxScreen->beVisuals[dmxScreen->beDefVisualIndex].visual; visual = dmxScreen->beVisuals[dmxScreen->beDefVisualIndex].visual;
dixLookupResourceByType((pointer *) &pCmap, wColormap(pWindow), dixLookupResourceByType((void **) &pCmap, wColormap(pWindow),
RT_COLORMAP, NullClient, DixUnknownAccess); RT_COLORMAP, NullClient, DixUnknownAccess);
pCmapPriv = DMX_GET_COLORMAP_PRIV(pCmap); pCmapPriv = DMX_GET_COLORMAP_PRIV(pCmap);
@ -192,7 +192,7 @@ dmxGetDefaultWindowAttributes(WindowPtr pWindow,
ColormapPtr pCmap; ColormapPtr pCmap;
dmxColormapPrivPtr pCmapPriv; dmxColormapPrivPtr pCmapPriv;
dixLookupResourceByType((pointer *) &pCmap, wColormap(pWindow), dixLookupResourceByType((void **) &pCmap, wColormap(pWindow),
RT_COLORMAP, NullClient, DixUnknownAccess); RT_COLORMAP, NullClient, DixUnknownAccess);
pCmapPriv = DMX_GET_COLORMAP_PRIV(pCmap); pCmapPriv = DMX_GET_COLORMAP_PRIV(pCmap);
*cmap = pCmapPriv->cmap; *cmap = pCmapPriv->cmap;
@ -561,7 +561,7 @@ dmxDoChangeWindowAttributes(WindowPtr pWindow,
ColormapPtr pCmap; ColormapPtr pCmap;
dmxColormapPrivPtr pCmapPriv; dmxColormapPrivPtr pCmapPriv;
dixLookupResourceByType((pointer *) &pCmap, wColormap(pWindow), dixLookupResourceByType((void **) &pCmap, wColormap(pWindow),
RT_COLORMAP, NullClient, DixUnknownAccess); RT_COLORMAP, NullClient, DixUnknownAccess);
pCmapPriv = DMX_GET_COLORMAP_PRIV(pCmap); pCmapPriv = DMX_GET_COLORMAP_PRIV(pCmap);
attribs->colormap = pCmapPriv->cmap; attribs->colormap = pCmapPriv->cmap;

86
hw/dmx/glxProxy/glxcmds.c
View File

@ -195,7 +195,7 @@ CreateContext(__GLXclientState * cl,
shareglxc = NULL; shareglxc = NULL;
} }
else { else {
dixLookupResourceByType((pointer *) &shareglxc, shareList, dixLookupResourceByType((void **) &shareglxc, shareList,
__glXContextRes, NullClient, DixUnknownAccess); __glXContextRes, NullClient, DixUnknownAccess);
if (!shareglxc) { if (!shareglxc) {
client->errorValue = shareList; client->errorValue = shareList;
@ -425,7 +425,7 @@ CreateContext(__GLXclientState * cl,
/* /*
** Register this context as a resource. ** Register this context as a resource.
*/ */
if (!AddResource(gcId, __glXContextRes, (pointer) glxc)) { if (!AddResource(gcId, __glXContextRes, (void *) glxc)) {
free(glxc->real_ids); free(glxc->real_ids);
free(glxc->real_vids); free(glxc->real_vids);
free(glxc); free(glxc);
@ -511,14 +511,14 @@ __glXBindSwapBarrierSGIX(__GLXclientState * cl, GLbyte * pc)
rc = dixLookupDrawable(&pDraw, req->drawable, client, 0, DixGetAttrAccess); rc = dixLookupDrawable(&pDraw, req->drawable, client, 0, DixGetAttrAccess);
if (rc != Success) { if (rc != Success) {
dixLookupResourceByType((pointer *) &pGlxPixmap, req->drawable, dixLookupResourceByType((void **) &pGlxPixmap, req->drawable,
__glXPixmapRes, NullClient, DixUnknownAccess); __glXPixmapRes, NullClient, DixUnknownAccess);
if (pGlxPixmap) if (pGlxPixmap)
pDraw = pGlxPixmap->pDraw; pDraw = pGlxPixmap->pDraw;
} }
if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) { if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
dixLookupResourceByType((pointer *) &pGlxWindow, req->drawable, dixLookupResourceByType((void **) &pGlxWindow, req->drawable,
__glXWindowRes, NullClient, DixUnknownAccess); __glXWindowRes, NullClient, DixUnknownAccess);
if (pGlxWindow) if (pGlxWindow)
pDraw = pGlxWindow->pDraw; pDraw = pGlxWindow->pDraw;
@ -544,14 +544,14 @@ __glXJoinSwapGroupSGIX(__GLXclientState * cl, GLbyte * pc)
rc = dixLookupDrawable(&pDraw, req->drawable, client, 0, DixManageAccess); rc = dixLookupDrawable(&pDraw, req->drawable, client, 0, DixManageAccess);
if (rc != Success) { if (rc != Success) {
dixLookupResourceByType((pointer *) &pGlxPixmap, req->drawable, dixLookupResourceByType((void **) &pGlxPixmap, req->drawable,
__glXPixmapRes, NullClient, DixUnknownAccess); __glXPixmapRes, NullClient, DixUnknownAccess);
if (pGlxPixmap) if (pGlxPixmap)
pDraw = pGlxPixmap->pDraw; pDraw = pGlxPixmap->pDraw;
} }
if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) { if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
dixLookupResourceByType((pointer *) &pGlxWindow, req->drawable, dixLookupResourceByType((void **) &pGlxWindow, req->drawable,
__glXWindowRes, NullClient, DixUnknownAccess); __glXWindowRes, NullClient, DixUnknownAccess);
if (pGlxWindow) if (pGlxWindow)
pDraw = pGlxWindow->pDraw; pDraw = pGlxWindow->pDraw;
@ -566,7 +566,7 @@ __glXJoinSwapGroupSGIX(__GLXclientState * cl, GLbyte * pc)
rc = dixLookupDrawable(&pMember, req->member, client, 0, rc = dixLookupDrawable(&pMember, req->member, client, 0,
DixGetAttrAccess); DixGetAttrAccess);
if (rc != Success) { if (rc != Success) {
dixLookupResourceByType((pointer *) &pGlxPixmap, req->member, dixLookupResourceByType((void **) &pGlxPixmap, req->member,
__glXPixmapRes, NullClient, __glXPixmapRes, NullClient,
DixUnknownAccess); DixUnknownAccess);
if (pGlxPixmap) if (pGlxPixmap)
@ -574,7 +574,7 @@ __glXJoinSwapGroupSGIX(__GLXclientState * cl, GLbyte * pc)
} }
if (!pMember && __GLX_IS_VERSION_SUPPORTED(1, 3)) { if (!pMember && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
dixLookupResourceByType((pointer *) &pGlxWindow, req->member, dixLookupResourceByType((void **) &pGlxWindow, req->member,
__glXWindowRes, NullClient, __glXWindowRes, NullClient,
DixUnknownAccess); DixUnknownAccess);
if (pGlxWindow) if (pGlxWindow)
@ -605,7 +605,7 @@ __glXDestroyContext(__GLXclientState * cl, GLbyte * pc)
int to_screen = 0; int to_screen = 0;
int s; int s;
dixLookupResourceByType((pointer *) &glxc, gcId, __glXContextRes, dixLookupResourceByType((void **) &glxc, gcId, __glXContextRes,
NullClient, DixUnknownAccess); NullClient, DixUnknownAccess);
if (glxc) { if (glxc) {
/* /*
@ -880,7 +880,7 @@ MakeCurrent(__GLXclientState * cl,
** Lookup new context. It must not be current for someone else. ** Lookup new context. It must not be current for someone else.
*/ */
if (contextId != None) { if (contextId != None) {
dixLookupResourceByType((pointer *) &glxc, contextId, __glXContextRes, dixLookupResourceByType((void **) &glxc, contextId, __glXContextRes,
NullClient, DixUnknownAccess); NullClient, DixUnknownAccess);
if (!glxc) { if (!glxc) {
client->errorValue = contextId; client->errorValue = contextId;
@ -935,7 +935,7 @@ MakeCurrent(__GLXclientState * cl,
} }
if (!pDraw) { if (!pDraw) {
dixLookupResourceByType((pointer *) &pGlxPixmap, drawId, dixLookupResourceByType((void **) &pGlxPixmap, drawId,
__glXPixmapRes, NullClient, __glXPixmapRes, NullClient,
DixUnknownAccess); DixUnknownAccess);
if (pGlxPixmap) { if (pGlxPixmap) {
@ -960,7 +960,7 @@ MakeCurrent(__GLXclientState * cl,
} }
if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) { if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
dixLookupResourceByType((pointer *) &pGlxWindow, drawId, dixLookupResourceByType((void **) &pGlxWindow, drawId,
__glXWindowRes, NullClient, __glXWindowRes, NullClient,
DixUnknownAccess); DixUnknownAccess);
if (pGlxWindow) { if (pGlxWindow) {
@ -983,7 +983,7 @@ MakeCurrent(__GLXclientState * cl,
} }
if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) { if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
dixLookupResourceByType((pointer *) &pGlxPbuffer, drawId, dixLookupResourceByType((void **) &pGlxPbuffer, drawId,
__glXPbufferRes, NullClient, __glXPbufferRes, NullClient,
DixUnknownAccess); DixUnknownAccess);
if (pGlxPbuffer) { if (pGlxPbuffer) {
@ -1050,7 +1050,7 @@ MakeCurrent(__GLXclientState * cl,
} }
if (!pReadDraw) { if (!pReadDraw) {
dixLookupResourceByType((pointer *) &pReadGlxPixmap, readId, dixLookupResourceByType((void **) &pReadGlxPixmap, readId,
__glXPixmapRes, NullClient, __glXPixmapRes, NullClient,
DixUnknownAccess); DixUnknownAccess);
if (pReadGlxPixmap) { if (pReadGlxPixmap) {
@ -1072,7 +1072,7 @@ MakeCurrent(__GLXclientState * cl,
} }
if (!pReadDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) { if (!pReadDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
dixLookupResourceByType((pointer *) &pGlxReadWindow, readId, dixLookupResourceByType((void **) &pGlxReadWindow, readId,
__glXWindowRes, NullClient, __glXWindowRes, NullClient,
DixUnknownAccess); DixUnknownAccess);
if (pGlxReadWindow) { if (pGlxReadWindow) {
@ -1094,7 +1094,7 @@ MakeCurrent(__GLXclientState * cl,
} }
if (!pReadDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) { if (!pReadDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
dixLookupResourceByType((pointer *) &pGlxReadPbuffer, readId, dixLookupResourceByType((void **) &pGlxReadPbuffer, readId,
__glXPbufferRes, NullClient, __glXPbufferRes, NullClient,
DixUnknownAccess); DixUnknownAccess);
if (pGlxReadPbuffer) { if (pGlxReadPbuffer) {
@ -1236,14 +1236,14 @@ MakeCurrent(__GLXclientState * cl,
to_screen = screenInfo.numScreens - 1; to_screen = screenInfo.numScreens - 1;
if (pDraw && new_reply.writeType != GLX_PBUFFER_TYPE) { if (pDraw && new_reply.writeType != GLX_PBUFFER_TYPE) {
dixLookupResourceByClass((pointer *) &pXinDraw, dixLookupResourceByClass((void **) &pXinDraw,
pDraw->id, XRC_DRAWABLE, pDraw->id, XRC_DRAWABLE,
client, DixReadAccess); client, DixReadAccess);
} }
if (pReadDraw && pReadDraw != pDraw && if (pReadDraw && pReadDraw != pDraw &&
new_reply.readType != GLX_PBUFFER_TYPE) { new_reply.readType != GLX_PBUFFER_TYPE) {
dixLookupResourceByClass((pointer *) &pXinReadDraw, dixLookupResourceByClass((void **) &pXinReadDraw,
pReadDraw->id, XRC_DRAWABLE, pReadDraw->id, XRC_DRAWABLE,
client, DixReadAccess); client, DixReadAccess);
} }
@ -1460,7 +1460,7 @@ __glXIsDirect(__GLXclientState * cl, GLbyte * pc)
/* /*
** Find the GL context. ** Find the GL context.
*/ */
dixLookupResourceByType((pointer *) &glxc, req->context, __glXContextRes, dixLookupResourceByType((void **) &glxc, req->context, __glXContextRes,
NullClient, DixUnknownAccess); NullClient, DixUnknownAccess);
if (!glxc) { if (!glxc) {
client->errorValue = req->context; client->errorValue = req->context;
@ -1619,13 +1619,13 @@ __glXCopyContext(__GLXclientState * cl, GLbyte * pc)
/* /*
** Check that each context exists. ** Check that each context exists.
*/ */
dixLookupResourceByType((pointer *) &src, source, __glXContextRes, dixLookupResourceByType((void **) &src, source, __glXContextRes,
NullClient, DixUnknownAccess); NullClient, DixUnknownAccess);
if (!src) { if (!src) {
client->errorValue = source; client->errorValue = source;
return __glXBadContext; return __glXBadContext;
} }
dixLookupResourceByType((pointer *) &dst, dest, __glXContextRes, dixLookupResourceByType((void **) &dst, dest, __glXContextRes,
NullClient, DixUnknownAccess); NullClient, DixUnknownAccess);
if (!dst) { if (!dst) {
client->errorValue = dest; client->errorValue = dest;
@ -1925,7 +1925,7 @@ CreateGLXPixmap(__GLXclientState * cl,
from_screen = 0; from_screen = 0;
to_screen = screenInfo.numScreens - 1; to_screen = screenInfo.numScreens - 1;
dixLookupResourceByClass((pointer *) &pXinDraw, dixLookupResourceByClass((void **) &pXinDraw,
pDraw->id, XRC_DRAWABLE, pDraw->id, XRC_DRAWABLE,
client, DixReadAccess); client, DixReadAccess);
} }
@ -2055,7 +2055,7 @@ __glXDestroyGLXPixmap(__GLXclientState * cl, GLbyte * pc)
/* /*
** Check if it's a valid GLX pixmap. ** Check if it's a valid GLX pixmap.
*/ */
dixLookupResourceByType((pointer *) &pGlxPixmap, glxpixmap, dixLookupResourceByType((void **) &pGlxPixmap, glxpixmap,
__glXPixmapRes, NullClient, DixUnknownAccess); __glXPixmapRes, NullClient, DixUnknownAccess);
if (!pGlxPixmap) { if (!pGlxPixmap) {
client->errorValue = glxpixmap; client->errorValue = glxpixmap;
@ -2141,7 +2141,7 @@ __glXDoSwapBuffers(__GLXclientState * cl, XID drawId, GLXContextTag tag)
} }
if (!pDraw) { if (!pDraw) {
dixLookupResourceByType((pointer *) &pGlxPixmap, drawId, dixLookupResourceByType((void **) &pGlxPixmap, drawId,
__glXPixmapRes, NullClient, DixUnknownAccess); __glXPixmapRes, NullClient, DixUnknownAccess);
if (pGlxPixmap) { if (pGlxPixmap) {
/* /*
@ -2153,7 +2153,7 @@ __glXDoSwapBuffers(__GLXclientState * cl, XID drawId, GLXContextTag tag)
} }
if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) { if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
dixLookupResourceByType((pointer *) &pGlxWindow, drawId, dixLookupResourceByType((void **) &pGlxWindow, drawId,
__glXWindowRes, NullClient, DixUnknownAccess); __glXWindowRes, NullClient, DixUnknownAccess);
if (pGlxWindow) { if (pGlxWindow) {
/* /*
@ -2183,7 +2183,7 @@ __glXDoSwapBuffers(__GLXclientState * cl, XID drawId, GLXContextTag tag)
if (!noPanoramiXExtension) { if (!noPanoramiXExtension) {
from_screen = 0; from_screen = 0;
to_screen = screenInfo.numScreens - 1; to_screen = screenInfo.numScreens - 1;
dixLookupResourceByClass((pointer *) &pXinDraw, dixLookupResourceByClass((void **) &pXinDraw,
pDraw->id, XRC_DRAWABLE, pDraw->id, XRC_DRAWABLE,
client, DixReadAccess); client, DixReadAccess);
} }
@ -2291,7 +2291,7 @@ __glXSwapBuffers(__GLXclientState * cl, GLbyte * pc)
} }
if (!pDraw) { if (!pDraw) {
dixLookupResourceByType((pointer *) &pGlxPixmap, drawId, dixLookupResourceByType((void **) &pGlxPixmap, drawId,
__glXPixmapRes, NullClient, DixUnknownAccess); __glXPixmapRes, NullClient, DixUnknownAccess);
if (pGlxPixmap) { if (pGlxPixmap) {
/* /*
@ -2302,7 +2302,7 @@ __glXSwapBuffers(__GLXclientState * cl, GLbyte * pc)
} }
if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) { if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
dixLookupResourceByType((pointer *) &pGlxWindow, drawId, dixLookupResourceByType((void **) &pGlxWindow, drawId,
__glXWindowRes, NullClient, DixUnknownAccess); __glXWindowRes, NullClient, DixUnknownAccess);
if (pGlxWindow) { if (pGlxWindow) {
/* /*
@ -2817,12 +2817,12 @@ __glXUseXFont(__GLXclientState * cl, GLbyte * pc)
** Font can actually be either the ID of a font or the ID of a GC ** Font can actually be either the ID of a font or the ID of a GC
** containing a font. ** containing a font.
*/ */
dixLookupResourceByType((pointer *) &pFont, req->font, RT_FONT, dixLookupResourceByType((void **) &pFont, req->font, RT_FONT,
NullClient, DixUnknownAccess); NullClient, DixUnknownAccess);
if (!pFont) { if (!pFont) {
GC *pGC; GC *pGC;
dixLookupResourceByType((pointer *) &pGC, req->font, dixLookupResourceByType((void **) &pGC, req->font,
RT_GC, NullClient, DixUnknownAccess); RT_GC, NullClient, DixUnknownAccess);
if (!pGC) { if (!pGC) {
client->errorValue = req->font; client->errorValue = req->font;
@ -3082,7 +3082,7 @@ __glXCreateWindow(__GLXclientState * cl, GLbyte * pc)
VisualPtr pVisual; VisualPtr pVisual;
VisualID visId; VisualID visId;
int i, rc; int i, rc;
pointer val; void *val;
/* /*
** Check if windowId is valid ** Check if windowId is valid
@ -3184,7 +3184,7 @@ __glXDestroyWindow(__GLXclientState * cl, GLbyte * pc)
ClientPtr client = cl->client; ClientPtr client = cl->client;
xGLXDestroyWindowReq *req = (xGLXDestroyWindowReq *) pc; xGLXDestroyWindowReq *req = (xGLXDestroyWindowReq *) pc;
XID glxwindow = req->glxwindow; XID glxwindow = req->glxwindow;
pointer val; void *val;
/* /*
** Check if it's a valid GLX window. ** Check if it's a valid GLX window.
@ -3216,7 +3216,7 @@ __glXQueryContext(__GLXclientState * cl, GLbyte * pc)
int nReplyBytes; int nReplyBytes;
req = (xGLXQueryContextReq *) pc; req = (xGLXQueryContextReq *) pc;
dixLookupResourceByType((pointer *) &ctx, req->context, __glXContextRes, dixLookupResourceByType((void **) &ctx, req->context, __glXContextRes,
NullClient, DixUnknownAccess); NullClient, DixUnknownAccess);
if (!ctx) { if (!ctx) {
client->errorValue = req->context; client->errorValue = req->context;
@ -3266,7 +3266,7 @@ __glXQueryContextInfoEXT(__GLXclientState * cl, GLbyte * pc)
int nReplyBytes; int nReplyBytes;
req = (xGLXQueryContextInfoEXTReq *) pc; req = (xGLXQueryContextInfoEXTReq *) pc;
dixLookupResourceByType((pointer *) &ctx, dixLookupResourceByType((void **) &ctx,
req->context, __glXContextRes, req->context, __glXContextRes,
client, DixReadAccess); client, DixReadAccess);
@ -3439,7 +3439,7 @@ __glXDestroyPbuffer(__GLXclientState * cl, GLbyte * pc)
/* /*
** Check if it's a valid Pbuffer ** Check if it's a valid Pbuffer
*/ */
dixLookupResourceByType((pointer *) &pGlxPbuffer, pbuffer, dixLookupResourceByType((void **) &pGlxPbuffer, pbuffer,
__glXPbufferRes, NullClient, DixUnknownAccess); __glXPbufferRes, NullClient, DixUnknownAccess);
if (!pGlxPbuffer) { if (!pGlxPbuffer) {
client->errorValue = pbuffer; client->errorValue = pbuffer;
@ -3514,7 +3514,7 @@ __glXGetDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
if (!pDraw) { if (!pDraw) {
__GLXpixmap *pGlxPixmap; __GLXpixmap *pGlxPixmap;
dixLookupResourceByType((pointer *) &pGlxPixmap, dixLookupResourceByType((void **) &pGlxPixmap,
drawId, __glXPixmapRes, drawId, __glXPixmapRes,
NullClient, DixUnknownAccess); NullClient, DixUnknownAccess);
if (pGlxPixmap) { if (pGlxPixmap) {
@ -3527,7 +3527,7 @@ __glXGetDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
if (!pDraw) { if (!pDraw) {
__glXWindow *pGlxWindow; __glXWindow *pGlxWindow;
dixLookupResourceByType((pointer *) &pGlxWindow, dixLookupResourceByType((void **) &pGlxWindow,
drawId, __glXWindowRes, drawId, __glXWindowRes,
NullClient, DixUnknownAccess); NullClient, DixUnknownAccess);
if (pGlxWindow) { if (pGlxWindow) {
@ -3540,7 +3540,7 @@ __glXGetDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
if (!pDraw) { if (!pDraw) {
__glXPbuffer *pGlxPbuffer; __glXPbuffer *pGlxPbuffer;
dixLookupResourceByType((pointer *) &pGlxPbuffer, dixLookupResourceByType((void **) &pGlxPbuffer,
drawId, __glXPbufferRes, drawId, __glXPbufferRes,
NullClient, DixUnknownAccess); NullClient, DixUnknownAccess);
if (pGlxPbuffer) { if (pGlxPbuffer) {
@ -3567,7 +3567,7 @@ __glXGetDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
#ifdef PANORAMIX #ifdef PANORAMIX
if (!noPanoramiXExtension) { if (!noPanoramiXExtension) {
if (Success != dixLookupResourceByClass((pointer *) &pXinDraw, if (Success != dixLookupResourceByClass((void **) &pXinDraw,
pDraw->id, XRC_DRAWABLE, pDraw->id, XRC_DRAWABLE,
client, DixReadAccess)) { client, DixReadAccess)) {
client->errorValue = drawId; client->errorValue = drawId;
@ -3676,7 +3676,7 @@ __glXChangeDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
if (!pDraw) { if (!pDraw) {
__GLXpixmap *pGlxPixmap; __GLXpixmap *pGlxPixmap;
dixLookupResourceByType((pointer *) &pGlxPixmap, dixLookupResourceByType((void **) &pGlxPixmap,
drawId, __glXPixmapRes, drawId, __glXPixmapRes,
NullClient, DixUnknownAccess); NullClient, DixUnknownAccess);
if (pGlxPixmap) { if (pGlxPixmap) {
@ -3689,7 +3689,7 @@ __glXChangeDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
if (!pDraw) { if (!pDraw) {
__glXWindow *pGlxWindow; __glXWindow *pGlxWindow;
dixLookupResourceByType((pointer *) &pGlxWindow, dixLookupResourceByType((void **) &pGlxWindow,
drawId, __glXWindowRes, drawId, __glXWindowRes,
NullClient, DixUnknownAccess); NullClient, DixUnknownAccess);
if (pGlxWindow) { if (pGlxWindow) {
@ -3702,7 +3702,7 @@ __glXChangeDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
if (!pDraw) { if (!pDraw) {
__glXPbuffer *pGlxPbuffer; __glXPbuffer *pGlxPbuffer;
dixLookupResourceByType((pointer *) &pGlxPbuffer, dixLookupResourceByType((void **) &pGlxPbuffer,
drawId, __glXPbufferRes, drawId, __glXPbufferRes,
NullClient, DixUnknownAccess); NullClient, DixUnknownAccess);
if (pGlxPbuffer) { if (pGlxPbuffer) {
@ -3731,7 +3731,7 @@ __glXChangeDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
if (!noPanoramiXExtension) { if (!noPanoramiXExtension) {
PanoramiXRes *pXinDraw; PanoramiXRes *pXinDraw;
if (Success != dixLookupResourceByClass((pointer *) &pXinDraw, if (Success != dixLookupResourceByClass((void **) &pXinDraw,
pDraw->id, XRC_DRAWABLE, pDraw->id, XRC_DRAWABLE,
client, DixReadAccess)) { client, DixReadAccess)) {
client->errorValue = drawId; client->errorValue = drawId;

6
hw/dmx/glxProxy/glxext.c
View File

@ -182,7 +182,7 @@ __glXFreeGLXWindow(__glXWindow * pGlxWindow)
WindowPtr pWindow = (WindowPtr) pGlxWindow->pDraw; WindowPtr pWindow = (WindowPtr) pGlxWindow->pDraw;
WindowPtr ret; WindowPtr ret;
dixLookupResourceByType((pointer) &ret, dixLookupResourceByType((void *) &ret,
pWindow->drawable.id, RT_WINDOW, pWindow->drawable.id, RT_WINDOW,
NullClient, DixUnknownAccess); NullClient, DixUnknownAccess);
if (ret == pWindow) { if (ret == pWindow) {
@ -414,7 +414,7 @@ __glXDispatch(ClientPtr client)
*/ */
XID xid = FakeClientID(client->index); XID xid = FakeClientID(client->index);
if (!AddResource(xid, __glXClientRes, (pointer) (long) client->index)) { if (!AddResource(xid, __glXClientRes, (void *) (long) client->index)) {
return BadAlloc; return BadAlloc;
} }
ResetClientState(client->index); ResetClientState(client->index);
@ -468,7 +468,7 @@ __glXSwapDispatch(ClientPtr client)
*/ */
XID xid = FakeClientID(client->index); XID xid = FakeClientID(client->index);
if (!AddResource(xid, __glXClientRes, (pointer) (long) client->index)) { if (!AddResource(xid, __glXClientRes, (void *) (long) client->index)) {
return BadAlloc; return BadAlloc;
} }
ResetClientState(client->index); ResetClientState(client->index);

4
hw/dmx/glxProxy/glxswap.c
View File

@ -110,7 +110,7 @@ SwapGroupIsReadyToSwap(SwapGroupPtr pSwap)
} }
static Bool static Bool
SGSwapCleanup(ClientPtr client, pointer closure) SGSwapCleanup(ClientPtr client, void *closure)
{ {
/* SwapGroupPtr pSwap = (SwapGroupPtr)closure; */ /* SwapGroupPtr pSwap = (SwapGroupPtr)closure; */
@ -154,7 +154,7 @@ SGSwapBuffers(__GLXclientState * cl, XID drawId, GLXContextTag tag,
else { else {
/* The swap group/barrier is not yet ready to swap, so put /* The swap group/barrier is not yet ready to swap, so put
* client to sleep until the rest are ready to swap */ * client to sleep until the rest are ready to swap */
ClientSleep(cl->client, SGSwapCleanup, (pointer) pWin); ClientSleep(cl->client, SGSwapCleanup, (void *) pWin);
pCur->sleeping = TRUE; pCur->sleeping = TRUE;
} }

10
hw/dmx/input/dmxbackend.c
View File

@ -101,7 +101,7 @@ typedef struct _myPrivate {
#endif #endif
/** Create and return a private data structure. */ /** Create and return a private data structure. */
pointer void *
dmxBackendCreatePrivate(DeviceIntPtr pDevice) dmxBackendCreatePrivate(DeviceIntPtr pDevice)
{ {
GETDMXLOCALFROMPDEVICE; GETDMXLOCALFROMPDEVICE;
@ -115,7 +115,7 @@ dmxBackendCreatePrivate(DeviceIntPtr pDevice)
* verify that the structure was actually created by * verify that the structure was actually created by
* #dmxBackendCreatePrivate. */ * #dmxBackendCreatePrivate. */
void void
dmxBackendDestroyPrivate(pointer private) dmxBackendDestroyPrivate(void *private)
{ {
free(private); free(private);
} }
@ -262,7 +262,7 @@ dmxBackendOffscreen(int screen, int x, int y)
/** This routine is called from #dmxCoreMotion for each motion /** This routine is called from #dmxCoreMotion for each motion
* event. \a x and \a y are global coordinants. */ * event. \a x and \a y are global coordinants. */
void void
dmxBackendUpdatePosition(pointer private, int x, int y) dmxBackendUpdatePosition(void *private, int x, int y)
{ {
GETPRIVFROMPRIVATE; GETPRIVFROMPRIVATE;
int screen = miPointerGetScreen(inputInfo.pointer)->myNum; int screen = miPointerGetScreen(inputInfo.pointer)->myNum;
@ -500,7 +500,7 @@ dmxBackendCollectEvents(DevicePtr pDev,
* event processing actually takes place here, but this is a convenient * event processing actually takes place here, but this is a convenient
* place to update the pointer. */ * place to update the pointer. */
void void
dmxBackendProcessInput(pointer private) dmxBackendProcessInput(void *private)
{ {
GETPRIVFROMPRIVATE; GETPRIVFROMPRIVATE;
@ -650,7 +650,7 @@ dmxBackendKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
/** Process #DMXFunctionType functions. The only function handled here /** Process #DMXFunctionType functions. The only function handled here
* is to acknowledge a pending server shutdown. */ * is to acknowledge a pending server shutdown. */
int int
dmxBackendFunctions(pointer private, DMXFunctionType function) dmxBackendFunctions(void *private, DMXFunctionType function)
{ {
switch (function) { switch (function) {
case DMX_FUNCTION_TERMINATE: case DMX_FUNCTION_TERMINATE:

10
hw/dmx/input/dmxbackend.h
View File

@ -38,8 +38,8 @@
#ifndef _DMXBACKEND_H_ #ifndef _DMXBACKEND_H_
#define _DMXBACKEND_H_ #define _DMXBACKEND_H_
extern pointer dmxBackendCreatePrivate(DeviceIntPtr pDevice); extern void *dmxBackendCreatePrivate(DeviceIntPtr pDevice);
extern void dmxBackendDestroyPrivate(pointer private); extern void dmxBackendDestroyPrivate(void *private);
extern void dmxBackendInit(DevicePtr pDev); extern void dmxBackendInit(DevicePtr pDev);
extern void dmxBackendLateReInit(DevicePtr pDev); extern void dmxBackendLateReInit(DevicePtr pDev);
extern void dmxBackendMouGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info); extern void dmxBackendMouGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
@ -49,8 +49,8 @@ extern void dmxBackendCollectEvents(DevicePtr pDev,
dmxEnqueueProcPtr enqueue, dmxEnqueueProcPtr enqueue,
dmxCheckSpecialProcPtr checkspecial, dmxCheckSpecialProcPtr checkspecial,
DMXBlockType block); DMXBlockType block);
extern void dmxBackendProcessInput(pointer private); extern void dmxBackendProcessInput(void *private);
extern int dmxBackendFunctions(pointer private, DMXFunctionType function); extern int dmxBackendFunctions(void *private, DMXFunctionType function);
extern void dmxBackendUpdatePosition(pointer private, int x, int y); extern void dmxBackendUpdatePosition(void *private, int x, int y);
#endif #endif

6
hw/dmx/input/dmxcommon.c
View File

@ -558,7 +558,7 @@ dmxFindPointerScreen(int x, int y)
* (e.g., when a keyboard and mouse form a pair that should share the * (e.g., when a keyboard and mouse form a pair that should share the
* same private area). If the requested private area cannot be located, * same private area). If the requested private area cannot be located,
* then NULL is returned. */ * then NULL is returned. */
pointer void *
dmxCommonCopyPrivate(DeviceIntPtr pDevice) dmxCommonCopyPrivate(DeviceIntPtr pDevice)
{ {
GETDMXLOCALFROMPDEVICE; GETDMXLOCALFROMPDEVICE;
@ -583,7 +583,7 @@ dmxCommonCopyPrivate(DeviceIntPtr pDevice)
* server startup and server shutdown). * server startup and server shutdown).
*/ */
void void
dmxCommonSaveState(pointer private) dmxCommonSaveState(void *private)
{ {
GETPRIVFROMPRIVATE; GETPRIVFROMPRIVATE;
XKeyboardState ks; XKeyboardState ks;
@ -641,7 +641,7 @@ dmxCommonSaveState(pointer private)
/** This routine restores all the information saved by #dmxCommonSaveState. */ /** This routine restores all the information saved by #dmxCommonSaveState. */
void void
dmxCommonRestoreState(pointer private) dmxCommonRestoreState(void *private)
{ {
GETPRIVFROMPRIVATE; GETPRIVFROMPRIVATE;
int retcode = -1; int retcode = -1;

Some files were not shown because too many files have changed in this diff Show More