diff options
Diffstat (limited to 'xorg-server/Xext')
26 files changed, 334 insertions, 352 deletions
diff --git a/xorg-server/Xext/dpmsproc.h b/xorg-server/Xext/dpmsproc.h index 7494dfd6f..82dccbd67 100644 --- a/xorg-server/Xext/dpmsproc.h +++ b/xorg-server/Xext/dpmsproc.h @@ -9,7 +9,7 @@ #include "dixstruct.h" -int DPMSSet(ClientPtr client, int level); -Bool DPMSSupported(void); +int _X_EXPORT DPMSSet(ClientPtr client, int level); +Bool _X_EXPORT DPMSSupported(void); #endif diff --git a/xorg-server/Xext/geext.c b/xorg-server/Xext/geext.c index f96b76468..b4e336110 100644 --- a/xorg-server/Xext/geext.c +++ b/xorg-server/Xext/geext.c @@ -148,7 +148,7 @@ SProcGEDispatch(ClientPtr client) * used in the furture for versioning support. */ static void -GEClientCallback(CallbackListPtr *list, pointer closure, pointer data) +GEClientCallback(CallbackListPtr *list, void *closure, void *data) { NewClientInfoRec *clientinfo = (NewClientInfoRec *) data; ClientPtr pClient = clientinfo->client; diff --git a/xorg-server/Xext/hashtable.c b/xorg-server/Xext/hashtable.c index e362ad12f..f10ca769d 100644 --- a/xorg-server/Xext/hashtable.c +++ b/xorg-server/Xext/hashtable.c @@ -23,7 +23,7 @@ struct HashTableRec { HashFunc hash; HashCompareFunc compare; - pointer cdata; + void *cdata; }; typedef struct { @@ -37,7 +37,7 @@ ht_create(int keySize, int dataSize, HashFunc hash, HashCompareFunc compare, - pointer cdata) + void *cdata) { int c; int numBuckets; @@ -117,8 +117,8 @@ double_size(HashTable ht) } } -pointer -ht_add(HashTable ht, pointer key) +void * +ht_add(HashTable ht, const void *key) { unsigned index = ht->hash(ht->cdata, key, ht->bucketBits); struct xorg_list *bucket = &ht->buckets[index]; @@ -164,7 +164,7 @@ ht_add(HashTable ht, pointer key) } void -ht_remove(HashTable ht, pointer key) +ht_remove(HashTable ht, const void *key) { unsigned index = ht->hash(ht->cdata, key, ht->bucketBits); struct xorg_list *bucket = &ht->buckets[index]; @@ -182,8 +182,8 @@ ht_remove(HashTable ht, pointer key) } } -pointer -ht_find(HashTable ht, pointer key) +void * +ht_find(HashTable ht, const void *key) { unsigned index = ht->hash(ht->cdata, key, ht->bucketBits); struct xorg_list *bucket = &ht->buckets[index]; diff --git a/xorg-server/Xext/hashtable.h b/xorg-server/Xext/hashtable.h index 5d1598425..a988af32c 100644 --- a/xorg-server/Xext/hashtable.h +++ b/xorg-server/Xext/hashtable.h @@ -55,7 +55,7 @@ extern _X_EXPORT HashTable ht_create(int keySize, int dataSize, HashFunc hash, HashCompareFunc compare, - pointer cdata); + void *cdata); /** @brief HtDestruct deinitializes the structure. It does not free the memory allocated to HashTableRec */ @@ -75,12 +75,12 @@ extern _X_EXPORT void ht_destroy(HashTable ht); to avoid returning NULL. Obviously the data pointed cannot be modified, as implied by dataSize being 0. */ -extern _X_EXPORT pointer ht_add(HashTable ht, pointer key); +extern _X_EXPORT void *ht_add(HashTable ht, const void *key); /** @brief Removes a key from the hash table along with its associated data, which will be free'd. */ -extern _X_EXPORT void ht_remove(HashTable ht, pointer key); +extern _X_EXPORT void ht_remove(HashTable ht, const void *key); /** @brief Finds the associated data of a key from the hash table. @@ -93,7 +93,7 @@ extern _X_EXPORT void ht_remove(HashTable ht, pointer key); use HtMember instead to determine if a key has been inserted. */ -extern _X_EXPORT pointer ht_find(HashTable ht, pointer key); +extern _X_EXPORT void *ht_find(HashTable ht, const void *key); /** @brief A generic hash function */ extern _X_EXPORT unsigned ht_generic_hash(void *cdata, diff --git a/xorg-server/Xext/panoramiX.c b/xorg-server/Xext/panoramiX.c index 4b82200ec..a64951a6d 100644 --- a/xorg-server/Xext/panoramiX.c +++ b/xorg-server/Xext/panoramiX.c @@ -118,7 +118,7 @@ static DevPrivateKeyRec PanoramiXScreenKeyRec; typedef struct { DDXPointRec clipOrg; DDXPointRec patOrg; - GCFuncs *wrapFuncs; + const GCFuncs *wrapFuncs; } PanoramiXGCRec, *PanoramiXGCPtr; typedef struct { @@ -130,11 +130,11 @@ static void XineramaValidateGC(GCPtr, unsigned long, DrawablePtr); static void XineramaChangeGC(GCPtr, unsigned long); static void XineramaCopyGC(GCPtr, unsigned long, 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 XineramaCopyClip(GCPtr, GCPtr); -static GCFuncs XineramaGCFuncs = { +static const GCFuncs XineramaGCFuncs = { XineramaValidateGC, XineramaChangeGC, XineramaCopyGC, XineramaDestroyGC, XineramaChangeClip, XineramaDestroyClip, XineramaCopyClip }; @@ -160,7 +160,7 @@ XineramaCloseScreen(ScreenPtr pScreen) if (pScreen->myNum == 0) RegionUninit(&PanoramiXScreenRegion); - free((pointer) pScreenPriv); + free(pScreenPriv); return (*pScreen->CloseScreen) (pScreen); } @@ -294,7 +294,7 @@ XineramaCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst) } 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); (*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects); @@ -318,7 +318,7 @@ XineramaDestroyClip(GCPtr pGC) } int -XineramaDeleteResource(pointer data, XID id) +XineramaDeleteResource(void *data, XID id) { free(data); return 1; @@ -330,7 +330,7 @@ typedef struct { } PanoramiXSearchData; static Bool -XineramaFindIDByScrnum(pointer resource, XID id, pointer privdata) +XineramaFindIDByScrnum(void *resource, XID id, void *privdata) { PanoramiXRes *res = (PanoramiXRes *) resource; PanoramiXSearchData *data = (PanoramiXSearchData *) privdata; @@ -342,7 +342,7 @@ PanoramiXRes * PanoramiXFindIDByScrnum(RESTYPE type, XID id, int screen) { PanoramiXSearchData data; - pointer val; + void *val; if (!screen) { dixLookupResourceByType(&val, id, type, serverClient, DixReadAccess); @@ -691,9 +691,9 @@ PanoramiXCreateConnectionBlock(void) root->mmHeight *= height_mult; while (ConnectionCallbackList) { - pointer tmp; + void *tmp; - tmp = (pointer) ConnectionCallbackList; + tmp = (void *) ConnectionCallbackList; (*ConnectionCallbackList->func) (); ConnectionCallbackList = ConnectionCallbackList->next; free(tmp); diff --git a/xorg-server/Xext/panoramiXprocs.c b/xorg-server/Xext/panoramiXprocs.c index 1a855fe08..87a2a176c 100644 --- a/xorg-server/Xext/panoramiXprocs.c +++ b/xorg-server/Xext/panoramiXprocs.c @@ -72,7 +72,7 @@ PanoramiXCreateWindow(ClientPtr client) if (Ones(stuff->mask) != len) return BadLength; - result = dixLookupResourceByType((pointer *) &parent, stuff->parent, + result = dixLookupResourceByType((void **) &parent, stuff->parent, XRT_WINDOW, client, DixWriteAccess); if (result != Success) return result; @@ -87,7 +87,7 @@ PanoramiXCreateWindow(ClientPtr client) pback_offset = Ones((Mask) stuff->mask & (CWBackPixmap - 1)); tmp = *((CARD32 *) &stuff[1] + pback_offset); if ((tmp != None) && (tmp != ParentRelative)) { - result = dixLookupResourceByType((pointer *) &backPix, tmp, + result = dixLookupResourceByType((void **) &backPix, tmp, XRT_PIXMAP, client, DixReadAccess); if (result != Success) return result; @@ -97,7 +97,7 @@ PanoramiXCreateWindow(ClientPtr client) pbord_offset = Ones((Mask) stuff->mask & (CWBorderPixmap - 1)); tmp = *((CARD32 *) &stuff[1] + pbord_offset); if (tmp != CopyFromParent) { - result = dixLookupResourceByType((pointer *) &bordPix, tmp, + result = dixLookupResourceByType((void **) &bordPix, tmp, XRT_PIXMAP, client, DixReadAccess); if (result != Success) return result; @@ -107,7 +107,7 @@ PanoramiXCreateWindow(ClientPtr client) cmap_offset = Ones((Mask) stuff->mask & (CWColormap - 1)); tmp = *((CARD32 *) &stuff[1] + cmap_offset); if ((tmp != CopyFromParent) && (tmp != None)) { - result = dixLookupResourceByType((pointer *) &cmap, tmp, + result = dixLookupResourceByType((void **) &cmap, tmp, XRT_COLORMAP, client, DixReadAccess); if (result != Success) @@ -178,7 +178,7 @@ PanoramiXChangeWindowAttributes(ClientPtr client) if (Ones(stuff->valueMask) != len) return BadLength; - result = dixLookupResourceByType((pointer *) &win, stuff->window, + result = dixLookupResourceByType((void **) &win, stuff->window, XRT_WINDOW, client, DixWriteAccess); if (result != Success) return result; @@ -191,7 +191,7 @@ PanoramiXChangeWindowAttributes(ClientPtr client) pback_offset = Ones((Mask) stuff->valueMask & (CWBackPixmap - 1)); tmp = *((CARD32 *) &stuff[1] + pback_offset); if ((tmp != None) && (tmp != ParentRelative)) { - result = dixLookupResourceByType((pointer *) &backPix, tmp, + result = dixLookupResourceByType((void **) &backPix, tmp, XRT_PIXMAP, client, DixReadAccess); if (result != Success) return result; @@ -201,7 +201,7 @@ PanoramiXChangeWindowAttributes(ClientPtr client) pbord_offset = Ones((Mask) stuff->valueMask & (CWBorderPixmap - 1)); tmp = *((CARD32 *) &stuff[1] + pbord_offset); if (tmp != CopyFromParent) { - result = dixLookupResourceByType((pointer *) &bordPix, tmp, + result = dixLookupResourceByType((void **) &bordPix, tmp, XRT_PIXMAP, client, DixReadAccess); if (result != Success) return result; @@ -211,7 +211,7 @@ PanoramiXChangeWindowAttributes(ClientPtr client) cmap_offset = Ones((Mask) stuff->valueMask & (CWColormap - 1)); tmp = *((CARD32 *) &stuff[1] + cmap_offset); if ((tmp != CopyFromParent) && (tmp != None)) { - result = dixLookupResourceByType((pointer *) &cmap, tmp, + result = dixLookupResourceByType((void **) &cmap, tmp, XRT_COLORMAP, client, DixReadAccess); if (result != Success) @@ -243,7 +243,7 @@ PanoramiXDestroyWindow(ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); - result = dixLookupResourceByType((pointer *) &win, stuff->id, XRT_WINDOW, + result = dixLookupResourceByType((void **) &win, stuff->id, XRT_WINDOW, client, DixDestroyAccess); if (result != Success) return result; @@ -271,7 +271,7 @@ PanoramiXDestroySubwindows(ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); - result = dixLookupResourceByType((pointer *) &win, stuff->id, XRT_WINDOW, + result = dixLookupResourceByType((void **) &win, stuff->id, XRT_WINDOW, client, DixDestroyAccess); if (result != Success) return result; @@ -299,7 +299,7 @@ PanoramiXChangeSaveSet(ClientPtr client) REQUEST_SIZE_MATCH(xChangeSaveSetReq); - result = dixLookupResourceByType((pointer *) &win, stuff->window, + result = dixLookupResourceByType((void **) &win, stuff->window, XRT_WINDOW, client, DixReadAccess); if (result != Success) return result; @@ -326,12 +326,12 @@ PanoramiXReparentWindow(ClientPtr client) REQUEST_SIZE_MATCH(xReparentWindowReq); - result = dixLookupResourceByType((pointer *) &win, stuff->window, + result = dixLookupResourceByType((void **) &win, stuff->window, XRT_WINDOW, client, DixWriteAccess); if (result != Success) return result; - result = dixLookupResourceByType((pointer *) &parent, stuff->parent, + result = dixLookupResourceByType((void **) &parent, stuff->parent, XRT_WINDOW, client, DixWriteAccess); if (result != Success) return result; @@ -365,7 +365,7 @@ PanoramiXMapWindow(ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); - result = dixLookupResourceByType((pointer *) &win, stuff->id, + result = dixLookupResourceByType((void **) &win, stuff->id, XRT_WINDOW, client, DixReadAccess); if (result != Success) return result; @@ -390,7 +390,7 @@ PanoramiXMapSubwindows(ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); - result = dixLookupResourceByType((pointer *) &win, stuff->id, + result = dixLookupResourceByType((void **) &win, stuff->id, XRT_WINDOW, client, DixReadAccess); if (result != Success) return result; @@ -415,7 +415,7 @@ PanoramiXUnmapWindow(ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); - result = dixLookupResourceByType((pointer *) &win, stuff->id, + result = dixLookupResourceByType((void **) &win, stuff->id, XRT_WINDOW, client, DixReadAccess); if (result != Success) return result; @@ -440,7 +440,7 @@ PanoramiXUnmapSubwindows(ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); - result = dixLookupResourceByType((pointer *) &win, stuff->id, + result = dixLookupResourceByType((void **) &win, stuff->id, XRT_WINDOW, client, DixReadAccess); if (result != Success) return result; @@ -474,12 +474,12 @@ PanoramiXConfigureWindow(ClientPtr client) return BadLength; /* because we need the parent */ - result = dixLookupResourceByType((pointer *) &pWin, stuff->window, + result = dixLookupResourceByType((void **) &pWin, stuff->window, RT_WINDOW, client, DixWriteAccess); if (result != Success) return result; - result = dixLookupResourceByType((pointer *) &win, stuff->window, + result = dixLookupResourceByType((void **) &win, stuff->window, XRT_WINDOW, client, DixWriteAccess); if (result != Success) return result; @@ -489,7 +489,7 @@ PanoramiXConfigureWindow(ClientPtr client) sib_offset = Ones((Mask) stuff->mask & (CWSibling - 1)); if ((tmp = *((CARD32 *) &stuff[1] + sib_offset))) { - result = dixLookupResourceByType((pointer *) &sib, tmp, XRT_WINDOW, + result = dixLookupResourceByType((void **) &sib, tmp, XRT_WINDOW, client, DixReadAccess); if (result != Success) return result; @@ -537,7 +537,7 @@ PanoramiXCirculateWindow(ClientPtr client) REQUEST_SIZE_MATCH(xCirculateWindowReq); - result = dixLookupResourceByType((pointer *) &win, stuff->window, + result = dixLookupResourceByType((void **) &win, stuff->window, XRT_WINDOW, client, DixWriteAccess); if (result != Success) return result; @@ -685,7 +685,7 @@ PanoramiXCreatePixmap(ClientPtr client) REQUEST_SIZE_MATCH(xCreatePixmapReq); client->errorValue = stuff->pid; - result = dixLookupResourceByClass((pointer *) &refDraw, stuff->drawable, + result = dixLookupResourceByClass((void **) &refDraw, stuff->drawable, XRC_DRAWABLE, client, DixReadAccess); if (result != Success) return (result == BadValue) ? BadDrawable : result; @@ -725,7 +725,7 @@ PanoramiXFreePixmap(ClientPtr client) client->errorValue = stuff->id; - result = dixLookupResourceByType((pointer *) &pix, stuff->id, XRT_PIXMAP, + result = dixLookupResourceByType((void **) &pix, stuff->id, XRT_PIXMAP, client, DixDestroyAccess); if (result != Success) return result; @@ -764,7 +764,7 @@ PanoramiXCreateGC(ClientPtr client) if (Ones(stuff->mask) != len) return BadLength; - result = dixLookupResourceByClass((pointer *) &refDraw, stuff->drawable, + result = dixLookupResourceByClass((void **) &refDraw, stuff->drawable, XRC_DRAWABLE, client, DixReadAccess); if (result != Success) return (result == BadValue) ? BadDrawable : result; @@ -772,7 +772,7 @@ PanoramiXCreateGC(ClientPtr client) if ((Mask) stuff->mask & GCTile) { tile_offset = Ones((Mask) stuff->mask & (GCTile - 1)); if ((tmp = *((CARD32 *) &stuff[1] + tile_offset))) { - result = dixLookupResourceByType((pointer *) &tile, tmp, XRT_PIXMAP, + result = dixLookupResourceByType((void **) &tile, tmp, XRT_PIXMAP, client, DixReadAccess); if (result != Success) return result; @@ -781,7 +781,7 @@ PanoramiXCreateGC(ClientPtr client) if ((Mask) stuff->mask & GCStipple) { stip_offset = Ones((Mask) stuff->mask & (GCStipple - 1)); if ((tmp = *((CARD32 *) &stuff[1] + stip_offset))) { - result = dixLookupResourceByType((pointer *) &stip, tmp, XRT_PIXMAP, + result = dixLookupResourceByType((void **) &stip, tmp, XRT_PIXMAP, client, DixReadAccess); if (result != Success) return result; @@ -790,7 +790,7 @@ PanoramiXCreateGC(ClientPtr client) if ((Mask) stuff->mask & GCClipMask) { clip_offset = Ones((Mask) stuff->mask & (GCClipMask - 1)); if ((tmp = *((CARD32 *) &stuff[1] + clip_offset))) { - result = dixLookupResourceByType((pointer *) &clip, tmp, XRT_PIXMAP, + result = dixLookupResourceByType((void **) &clip, tmp, XRT_PIXMAP, client, DixReadAccess); if (result != Success) return result; @@ -844,7 +844,7 @@ PanoramiXChangeGC(ClientPtr client) if (Ones(stuff->mask) != len) return BadLength; - result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, + result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, client, DixReadAccess); if (result != Success) return result; @@ -852,7 +852,7 @@ PanoramiXChangeGC(ClientPtr client) if ((Mask) stuff->mask & GCTile) { tile_offset = Ones((Mask) stuff->mask & (GCTile - 1)); if ((tmp = *((CARD32 *) &stuff[1] + tile_offset))) { - result = dixLookupResourceByType((pointer *) &tile, tmp, XRT_PIXMAP, + result = dixLookupResourceByType((void **) &tile, tmp, XRT_PIXMAP, client, DixReadAccess); if (result != Success) return result; @@ -861,7 +861,7 @@ PanoramiXChangeGC(ClientPtr client) if ((Mask) stuff->mask & GCStipple) { stip_offset = Ones((Mask) stuff->mask & (GCStipple - 1)); if ((tmp = *((CARD32 *) &stuff[1] + stip_offset))) { - result = dixLookupResourceByType((pointer *) &stip, tmp, XRT_PIXMAP, + result = dixLookupResourceByType((void **) &stip, tmp, XRT_PIXMAP, client, DixReadAccess); if (result != Success) return result; @@ -870,7 +870,7 @@ PanoramiXChangeGC(ClientPtr client) if ((Mask) stuff->mask & GCClipMask) { clip_offset = Ones((Mask) stuff->mask & (GCClipMask - 1)); if ((tmp = *((CARD32 *) &stuff[1] + clip_offset))) { - result = dixLookupResourceByType((pointer *) &clip, tmp, XRT_PIXMAP, + result = dixLookupResourceByType((void **) &clip, tmp, XRT_PIXMAP, client, DixReadAccess); if (result != Success) return result; @@ -903,12 +903,12 @@ PanoramiXCopyGC(ClientPtr client) REQUEST_SIZE_MATCH(xCopyGCReq); - result = dixLookupResourceByType((pointer *) &srcGC, stuff->srcGC, XRT_GC, + result = dixLookupResourceByType((void **) &srcGC, stuff->srcGC, XRT_GC, client, DixReadAccess); if (result != Success) return result; - result = dixLookupResourceByType((pointer *) &dstGC, stuff->dstGC, XRT_GC, + result = dixLookupResourceByType((void **) &dstGC, stuff->dstGC, XRT_GC, client, DixWriteAccess); if (result != Success) return result; @@ -934,7 +934,7 @@ PanoramiXSetDashes(ClientPtr client) REQUEST_FIXED_SIZE(xSetDashesReq, stuff->nDashes); - result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, + result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, client, DixWriteAccess); if (result != Success) return result; @@ -959,7 +959,7 @@ PanoramiXSetClipRectangles(ClientPtr client) REQUEST_AT_LEAST_SIZE(xSetClipRectanglesReq); - result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, + result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, client, DixWriteAccess); if (result != Success) return result; @@ -984,7 +984,7 @@ PanoramiXFreeGC(ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); - result = dixLookupResourceByType((pointer *) &gc, stuff->id, XRT_GC, + result = dixLookupResourceByType((void **) &gc, stuff->id, XRT_GC, client, DixDestroyAccess); if (result != Success) return result; @@ -1013,7 +1013,7 @@ PanoramiXClearToBackground(ClientPtr client) REQUEST_SIZE_MATCH(xClearAreaReq); - result = dixLookupResourceByType((pointer *) &win, stuff->window, + result = dixLookupResourceByType((void **) &win, stuff->window, XRT_WINDOW, client, DixWriteAccess); if (result != Success) return result; @@ -1058,14 +1058,14 @@ PanoramiXCopyArea(ClientPtr client) REQUEST_SIZE_MATCH(xCopyAreaReq); - result = dixLookupResourceByClass((pointer *) &src, stuff->srcDrawable, + result = dixLookupResourceByClass((void **) &src, stuff->srcDrawable, XRC_DRAWABLE, client, DixReadAccess); if (result != Success) return (result == BadValue) ? BadDrawable : result; srcShared = IS_SHARED_PIXMAP(src); - result = dixLookupResourceByClass((pointer *) &dst, stuff->dstDrawable, + result = dixLookupResourceByClass((void **) &dst, stuff->dstDrawable, XRC_DRAWABLE, client, DixWriteAccess); if (result != Success) return (result == BadValue) ? BadDrawable : result; @@ -1075,7 +1075,7 @@ PanoramiXCopyArea(ClientPtr client) if (dstShared && srcShared) return (*SavedProcVector[X_CopyArea]) (client); - result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, + result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, client, DixReadAccess); if (result != Success) return result; @@ -1217,14 +1217,14 @@ PanoramiXCopyPlane(ClientPtr client) REQUEST_SIZE_MATCH(xCopyPlaneReq); - rc = dixLookupResourceByClass((pointer *) &src, stuff->srcDrawable, + rc = dixLookupResourceByClass((void **) &src, stuff->srcDrawable, XRC_DRAWABLE, client, DixReadAccess); if (rc != Success) return (rc == BadValue) ? BadDrawable : rc; srcShared = IS_SHARED_PIXMAP(src); - rc = dixLookupResourceByClass((pointer *) &dst, stuff->dstDrawable, + rc = dixLookupResourceByClass((void **) &dst, stuff->dstDrawable, XRC_DRAWABLE, client, DixWriteAccess); if (rc != Success) return (rc == BadValue) ? BadDrawable : rc; @@ -1234,7 +1234,7 @@ PanoramiXCopyPlane(ClientPtr client) if (dstShared && srcShared) return (*SavedProcVector[X_CopyPlane]) (client); - rc = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, + rc = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, client, DixReadAccess); if (rc != Success) return rc; @@ -1325,7 +1325,7 @@ PanoramiXPolyPoint(ClientPtr client) REQUEST_AT_LEAST_SIZE(xPolyPointReq); - result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, + result = dixLookupResourceByClass((void **) &draw, stuff->drawable, XRC_DRAWABLE, client, DixWriteAccess); if (result != Success) return (result == BadValue) ? BadDrawable : result; @@ -1333,7 +1333,7 @@ PanoramiXPolyPoint(ClientPtr client) if (IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_PolyPoint]) (client); - result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, + result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, client, DixReadAccess); if (result != Success) return result; @@ -1390,7 +1390,7 @@ PanoramiXPolyLine(ClientPtr client) REQUEST_AT_LEAST_SIZE(xPolyLineReq); - result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, + result = dixLookupResourceByClass((void **) &draw, stuff->drawable, XRC_DRAWABLE, client, DixWriteAccess); if (result != Success) return (result == BadValue) ? BadDrawable : result; @@ -1398,7 +1398,7 @@ PanoramiXPolyLine(ClientPtr client) if (IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_PolyLine]) (client); - result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, + result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, client, DixReadAccess); if (result != Success) return result; @@ -1455,7 +1455,7 @@ PanoramiXPolySegment(ClientPtr client) REQUEST_AT_LEAST_SIZE(xPolySegmentReq); - result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, + result = dixLookupResourceByClass((void **) &draw, stuff->drawable, XRC_DRAWABLE, client, DixWriteAccess); if (result != Success) return (result == BadValue) ? BadDrawable : result; @@ -1463,7 +1463,7 @@ PanoramiXPolySegment(ClientPtr client) if (IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_PolySegment]) (client); - result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, + result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, client, DixReadAccess); if (result != Success) return result; @@ -1523,7 +1523,7 @@ PanoramiXPolyRectangle(ClientPtr client) REQUEST_AT_LEAST_SIZE(xPolyRectangleReq); - result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, + result = dixLookupResourceByClass((void **) &draw, stuff->drawable, XRC_DRAWABLE, client, DixWriteAccess); if (result != Success) return (result == BadValue) ? BadDrawable : result; @@ -1531,7 +1531,7 @@ PanoramiXPolyRectangle(ClientPtr client) if (IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_PolyRectangle]) (client); - result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, + result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, client, DixReadAccess); if (result != Success) return result; @@ -1590,7 +1590,7 @@ PanoramiXPolyArc(ClientPtr client) REQUEST_AT_LEAST_SIZE(xPolyArcReq); - result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, + result = dixLookupResourceByClass((void **) &draw, stuff->drawable, XRC_DRAWABLE, client, DixWriteAccess); if (result != Success) return (result == BadValue) ? BadDrawable : result; @@ -1598,7 +1598,7 @@ PanoramiXPolyArc(ClientPtr client) if (IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_PolyArc]) (client); - result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, + result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, client, DixReadAccess); if (result != Success) return result; @@ -1655,7 +1655,7 @@ PanoramiXFillPoly(ClientPtr client) REQUEST_AT_LEAST_SIZE(xFillPolyReq); - result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, + result = dixLookupResourceByClass((void **) &draw, stuff->drawable, XRC_DRAWABLE, client, DixWriteAccess); if (result != Success) return (result == BadValue) ? BadDrawable : result; @@ -1663,7 +1663,7 @@ PanoramiXFillPoly(ClientPtr client) if (IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_FillPoly]) (client); - result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, + result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, client, DixReadAccess); if (result != Success) return result; @@ -1721,7 +1721,7 @@ PanoramiXPolyFillRectangle(ClientPtr client) REQUEST_AT_LEAST_SIZE(xPolyFillRectangleReq); - result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, + result = dixLookupResourceByClass((void **) &draw, stuff->drawable, XRC_DRAWABLE, client, DixWriteAccess); if (result != Success) return (result == BadValue) ? BadDrawable : result; @@ -1729,7 +1729,7 @@ PanoramiXPolyFillRectangle(ClientPtr client) if (IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_PolyFillRectangle]) (client); - result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, + result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, client, DixReadAccess); if (result != Success) return result; @@ -1788,7 +1788,7 @@ PanoramiXPolyFillArc(ClientPtr client) REQUEST_AT_LEAST_SIZE(xPolyFillArcReq); - result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, + result = dixLookupResourceByClass((void **) &draw, stuff->drawable, XRC_DRAWABLE, client, DixWriteAccess); if (result != Success) return (result == BadValue) ? BadDrawable : result; @@ -1796,7 +1796,7 @@ PanoramiXPolyFillArc(ClientPtr client) if (IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_PolyFillArc]) (client); - result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, + result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, client, DixReadAccess); if (result != Success) return result; @@ -1853,7 +1853,7 @@ PanoramiXPutImage(ClientPtr client) REQUEST_AT_LEAST_SIZE(xPutImageReq); - result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, + result = dixLookupResourceByClass((void **) &draw, stuff->drawable, XRC_DRAWABLE, client, DixWriteAccess); if (result != Success) return (result == BadValue) ? BadDrawable : result; @@ -1861,7 +1861,7 @@ PanoramiXPutImage(ClientPtr client) if (IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_PutImage]) (client); - result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, + result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, client, DixReadAccess); if (result != Success) return result; @@ -1907,7 +1907,7 @@ PanoramiXGetImage(ClientPtr client) return BadValue; } - rc = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, + rc = dixLookupResourceByClass((void **) &draw, stuff->drawable, XRC_DRAWABLE, client, DixWriteAccess); if (rc != Success) return (rc == BadValue) ? BadDrawable : rc; @@ -2053,7 +2053,7 @@ PanoramiXPolyText8(ClientPtr client) REQUEST_AT_LEAST_SIZE(xPolyTextReq); - result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, + result = dixLookupResourceByClass((void **) &draw, stuff->drawable, XRC_DRAWABLE, client, DixWriteAccess); if (result != Success) return (result == BadValue) ? BadDrawable : result; @@ -2061,7 +2061,7 @@ PanoramiXPolyText8(ClientPtr client) if (IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_PolyText8]) (client); - result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, + result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, client, DixReadAccess); if (result != Success) return result; @@ -2096,7 +2096,7 @@ PanoramiXPolyText16(ClientPtr client) REQUEST_AT_LEAST_SIZE(xPolyTextReq); - result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, + result = dixLookupResourceByClass((void **) &draw, stuff->drawable, XRC_DRAWABLE, client, DixWriteAccess); if (result != Success) return (result == BadValue) ? BadDrawable : result; @@ -2104,7 +2104,7 @@ PanoramiXPolyText16(ClientPtr client) if (IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_PolyText16]) (client); - result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, + result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, client, DixReadAccess); if (result != Success) return result; @@ -2139,7 +2139,7 @@ PanoramiXImageText8(ClientPtr client) REQUEST_FIXED_SIZE(xImageTextReq, stuff->nChars); - result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, + result = dixLookupResourceByClass((void **) &draw, stuff->drawable, XRC_DRAWABLE, client, DixWriteAccess); if (result != Success) return (result == BadValue) ? BadDrawable : result; @@ -2147,7 +2147,7 @@ PanoramiXImageText8(ClientPtr client) if (IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_ImageText8]) (client); - result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, + result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, client, DixReadAccess); if (result != Success) return result; @@ -2182,7 +2182,7 @@ PanoramiXImageText16(ClientPtr client) REQUEST_FIXED_SIZE(xImageTextReq, stuff->nChars << 1); - result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, + result = dixLookupResourceByClass((void **) &draw, stuff->drawable, XRC_DRAWABLE, client, DixWriteAccess); if (result != Success) return (result == BadValue) ? BadDrawable : result; @@ -2190,7 +2190,7 @@ PanoramiXImageText16(ClientPtr client) if (IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_ImageText16]) (client); - result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC, + result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, client, DixReadAccess); if (result != Success) return result; @@ -2223,7 +2223,7 @@ PanoramiXCreateColormap(ClientPtr client) REQUEST_SIZE_MATCH(xCreateColormapReq); - result = dixLookupResourceByType((pointer *) &win, stuff->window, + result = dixLookupResourceByType((void **) &win, stuff->window, XRT_WINDOW, client, DixReadAccess); if (result != Success) return result; @@ -2264,7 +2264,7 @@ PanoramiXFreeColormap(ClientPtr client) client->errorValue = stuff->id; - result = dixLookupResourceByType((pointer *) &cmap, stuff->id, XRT_COLORMAP, + result = dixLookupResourceByType((void **) &cmap, stuff->id, XRT_COLORMAP, client, DixDestroyAccess); if (result != Success) return result; @@ -2294,7 +2294,7 @@ PanoramiXCopyColormapAndFree(ClientPtr client) client->errorValue = stuff->srcCmap; - result = dixLookupResourceByType((pointer *) &cmap, stuff->srcCmap, + result = dixLookupResourceByType((void **) &cmap, stuff->srcCmap, XRT_COLORMAP, client, DixReadAccess | DixWriteAccess); if (result != Success) @@ -2333,7 +2333,7 @@ PanoramiXInstallColormap(ClientPtr client) client->errorValue = stuff->id; - result = dixLookupResourceByType((pointer *) &cmap, stuff->id, XRT_COLORMAP, + result = dixLookupResourceByType((void **) &cmap, stuff->id, XRT_COLORMAP, client, DixReadAccess); if (result != Success) return result; @@ -2358,7 +2358,7 @@ PanoramiXUninstallColormap(ClientPtr client) client->errorValue = stuff->id; - result = dixLookupResourceByType((pointer *) &cmap, stuff->id, XRT_COLORMAP, + result = dixLookupResourceByType((void **) &cmap, stuff->id, XRT_COLORMAP, client, DixReadAccess); if (result != Success) return result; @@ -2384,7 +2384,7 @@ PanoramiXAllocColor(ClientPtr client) client->errorValue = stuff->cmap; - result = dixLookupResourceByType((pointer *) &cmap, stuff->cmap, + result = dixLookupResourceByType((void **) &cmap, stuff->cmap, XRT_COLORMAP, client, DixWriteAccess); if (result != Success) return result; @@ -2410,7 +2410,7 @@ PanoramiXAllocNamedColor(ClientPtr client) client->errorValue = stuff->cmap; - result = dixLookupResourceByType((pointer *) &cmap, stuff->cmap, + result = dixLookupResourceByType((void **) &cmap, stuff->cmap, XRT_COLORMAP, client, DixWriteAccess); if (result != Success) return result; @@ -2436,7 +2436,7 @@ PanoramiXAllocColorCells(ClientPtr client) client->errorValue = stuff->cmap; - result = dixLookupResourceByType((pointer *) &cmap, stuff->cmap, + result = dixLookupResourceByType((void **) &cmap, stuff->cmap, XRT_COLORMAP, client, DixWriteAccess); if (result != Success) return result; @@ -2462,7 +2462,7 @@ PanoramiXAllocColorPlanes(ClientPtr client) client->errorValue = stuff->cmap; - result = dixLookupResourceByType((pointer *) &cmap, stuff->cmap, + result = dixLookupResourceByType((void **) &cmap, stuff->cmap, XRT_COLORMAP, client, DixWriteAccess); if (result != Success) return result; @@ -2488,7 +2488,7 @@ PanoramiXFreeColors(ClientPtr client) client->errorValue = stuff->cmap; - result = dixLookupResourceByType((pointer *) &cmap, stuff->cmap, + result = dixLookupResourceByType((void **) &cmap, stuff->cmap, XRT_COLORMAP, client, DixWriteAccess); if (result != Success) return result; @@ -2512,7 +2512,7 @@ PanoramiXStoreColors(ClientPtr client) client->errorValue = stuff->cmap; - result = dixLookupResourceByType((pointer *) &cmap, stuff->cmap, + result = dixLookupResourceByType((void **) &cmap, stuff->cmap, XRT_COLORMAP, client, DixWriteAccess); if (result != Success) return result; @@ -2538,7 +2538,7 @@ PanoramiXStoreNamedColor(ClientPtr client) client->errorValue = stuff->cmap; - result = dixLookupResourceByType((pointer *) &cmap, stuff->cmap, + result = dixLookupResourceByType((void **) &cmap, stuff->cmap, XRT_COLORMAP, client, DixWriteAccess); if (result != Success) return result; diff --git a/xorg-server/Xext/panoramiXsrv.h b/xorg-server/Xext/panoramiXsrv.h index 0fcde4fd5..6d93eec2e 100644 --- a/xorg-server/Xext/panoramiXsrv.h +++ b/xorg-server/Xext/panoramiXsrv.h @@ -19,7 +19,7 @@ extern _X_EXPORT Bool PanoramiXCreateConnectionBlock(void); extern _X_EXPORT PanoramiXRes *PanoramiXFindIDByScrnum(RESTYPE, XID, int); extern _X_EXPORT Bool XineramaRegisterConnectionBlockCallback(void (*func) (void)); -extern _X_EXPORT int XineramaDeleteResource(pointer, XID); +extern _X_EXPORT int XineramaDeleteResource(void *, XID); extern _X_EXPORT void XineramaReinitData(void); diff --git a/xorg-server/Xext/saver.c b/xorg-server/Xext/saver.c index e9633f4b3..6afd79c34 100644 --- a/xorg-server/Xext/saver.c +++ b/xorg-server/Xext/saver.c @@ -113,9 +113,7 @@ typedef struct _ScreenSaverSuspension { int count; } ScreenSaverSuspensionRec; -static int ScreenSaverFreeSuspend(pointer /*value */ , - XID /* id */ - ); +static int ScreenSaverFreeSuspend(void *value, XID id); /* * each screen has a list of clients requesting @@ -137,18 +135,14 @@ typedef struct _ScreenSaverEvent { CARD32 mask; } ScreenSaverEventRec; -static int ScreenSaverFreeEvents(pointer /* value */ , - XID /* id */ - ); +static int ScreenSaverFreeEvents(void * value, XID id); -static Bool setEventMask(ScreenPtr /* pScreen */ , - ClientPtr /* client */ , - unsigned long /* mask */ - ); +static Bool setEventMask(ScreenPtr pScreen, + ClientPtr client, + unsigned long mask); -static unsigned long getEventMask(ScreenPtr /* pScreen */ , - ClientPtr /* client */ - ); +static unsigned long getEventMask(ScreenPtr pScreen, + ClientPtr client); /* * when a client sets the screen saver attributes, a resource is @@ -174,21 +168,16 @@ typedef struct _ScreenSaverAttr { unsigned long *values; } ScreenSaverAttrRec, *ScreenSaverAttrPtr; -static int ScreenSaverFreeAttr(pointer /* value */ , - XID /* id */ - ); +static int ScreenSaverFreeAttr(void *value, XID id); -static void FreeAttrs(ScreenSaverAttrPtr /* pAttr */ - ); +static void FreeAttrs(ScreenSaverAttrPtr pAttr); -static void FreeScreenAttr(ScreenSaverAttrPtr /* pAttr */ - ); +static void FreeScreenAttr(ScreenSaverAttrPtr pAttr); static void - SendScreenSaverNotify(ScreenPtr /* pScreen */ , - int /* state */ , - Bool /* forced */ - ); +SendScreenSaverNotify(ScreenPtr pScreen, + int state, + Bool forced); typedef struct _ScreenSaverScreenPrivate { ScreenSaverEventPtr events; @@ -197,8 +186,7 @@ typedef struct _ScreenSaverScreenPrivate { Colormap installedMap; } ScreenSaverScreenPrivateRec, *ScreenSaverScreenPrivatePtr; -static ScreenSaverScreenPrivatePtr MakeScreenPrivate(ScreenPtr /* pScreen */ - ); +static ScreenSaverScreenPrivatePtr MakeScreenPrivate(ScreenPtr pScreen); static DevPrivateKeyRec ScreenPrivateKeyRec; @@ -294,7 +282,7 @@ setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask) pEv->client = client; pEv->screen = pScreen; pEv->resource = FakeClientID(client->index); - if (!AddResource(pEv->resource, SaverEventType, (pointer) pEv)) + if (!AddResource(pEv->resource, SaverEventType, (void *) pEv)) return FALSE; } pEv->mask = mask; @@ -325,7 +313,7 @@ FreeScreenAttr(ScreenSaverAttrPtr pAttr) } static int -ScreenSaverFreeEvents(pointer value, XID id) +ScreenSaverFreeEvents(void *value, XID id) { ScreenSaverEventPtr pOld = (ScreenSaverEventPtr) value; ScreenPtr pScreen = pOld->screen; @@ -347,7 +335,7 @@ ScreenSaverFreeEvents(pointer value, XID id) } static int -ScreenSaverFreeAttr(pointer value, XID id) +ScreenSaverFreeAttr(void *value, XID id) { ScreenSaverAttrPtr pOldAttr = (ScreenSaverAttrPtr) value; ScreenPtr pScreen = pOldAttr->screen; @@ -369,7 +357,7 @@ ScreenSaverFreeAttr(pointer value, XID id) } static int -ScreenSaverFreeSuspend(pointer value, XID id) +ScreenSaverFreeSuspend(void *value, XID id) { ScreenSaverSuspensionPtr data = (ScreenSaverSuspensionPtr) value; ScreenSaverSuspensionPtr *prev, this; @@ -465,7 +453,7 @@ UninstallSaverColormap(ScreenPtr pScreen) int rc; if (pPriv && pPriv->installedMap != None) { - rc = dixLookupResourceByType((pointer *) &pCmap, pPriv->installedMap, + rc = dixLookupResourceByType((void **) &pCmap, pPriv->installedMap, RT_COLORMAP, serverClient, DixUninstallAccess); if (rc == Success) @@ -576,7 +564,7 @@ CreateSaverWindow(ScreenPtr pScreen) if (i < numInstalled) return TRUE; - result = dixLookupResourceByType((pointer *) &pCmap, wantMap, RT_COLORMAP, + result = dixLookupResourceByType((void **) &pCmap, wantMap, RT_COLORMAP, serverClient, DixInstallAccess); if (result != Success) return TRUE; @@ -926,7 +914,7 @@ ScreenSaverSetAttributes(ClientPtr client) } else { ret = - dixLookupResourceByType((pointer *) &pPixmap, pixID, + dixLookupResourceByType((void **) &pPixmap, pixID, RT_PIXMAP, client, DixReadAccess); if (ret == Success) { if ((pPixmap->drawable.depth != depth) || @@ -958,7 +946,7 @@ ScreenSaverSetAttributes(ClientPtr client) } else { ret = - dixLookupResourceByType((pointer *) &pPixmap, pixID, + dixLookupResourceByType((void **) &pPixmap, pixID, RT_PIXMAP, client, DixReadAccess); if (ret == Success) { if ((pPixmap->drawable.depth != depth) || @@ -1042,7 +1030,7 @@ ScreenSaverSetAttributes(ClientPtr client) break; case CWColormap: cmap = (Colormap) * pVlist; - ret = dixLookupResourceByType((pointer *) &pCmap, cmap, RT_COLORMAP, + ret = dixLookupResourceByType((void **) &pCmap, cmap, RT_COLORMAP, client, DixUseAccess); if (ret != Success) { client->errorValue = cmap; @@ -1061,7 +1049,7 @@ ScreenSaverSetAttributes(ClientPtr client) *values++ = None; } else { - ret = dixLookupResourceByType((pointer *) &pCursor, cursorID, + ret = dixLookupResourceByType((void **) &pCursor, cursorID, RT_CURSOR, client, DixUseAccess); if (ret != Success) { client->errorValue = cursorID; @@ -1082,7 +1070,7 @@ ScreenSaverSetAttributes(ClientPtr client) FreeScreenAttr(pPriv->attr); pPriv->attr = pAttr; pAttr->resource = FakeClientID(client->index); - if (!AddResource(pAttr->resource, AttrType, (pointer) pAttr)) + if (!AddResource(pAttr->resource, AttrType, (void *) pAttr)) return BadAlloc; return Success; PatchUp: @@ -1134,7 +1122,7 @@ ProcScreenSaverSetAttributes(ClientPtr client) REQUEST_AT_LEAST_SIZE(xScreenSaverSetAttributesReq); - status = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, + status = dixLookupResourceByClass((void **) &draw, stuff->drawable, XRC_DRAWABLE, client, DixWriteAccess); if (status != Success) return (status == BadValue) ? BadDrawable : status; @@ -1149,7 +1137,7 @@ ProcScreenSaverSetAttributes(ClientPtr client) pback_offset = Ones((Mask) stuff->mask & (CWBackPixmap - 1)); tmp = *((CARD32 *) &stuff[1] + pback_offset); if ((tmp != None) && (tmp != ParentRelative)) { - status = dixLookupResourceByType((pointer *) &backPix, tmp, + status = dixLookupResourceByType((void **) &backPix, tmp, XRT_PIXMAP, client, DixReadAccess); if (status != Success) @@ -1161,7 +1149,7 @@ ProcScreenSaverSetAttributes(ClientPtr client) pbord_offset = Ones((Mask) stuff->mask & (CWBorderPixmap - 1)); tmp = *((CARD32 *) &stuff[1] + pbord_offset); if (tmp != CopyFromParent) { - status = dixLookupResourceByType((pointer *) &bordPix, tmp, + status = dixLookupResourceByType((void **) &bordPix, tmp, XRT_PIXMAP, client, DixReadAccess); if (status != Success) @@ -1173,7 +1161,7 @@ ProcScreenSaverSetAttributes(ClientPtr client) cmap_offset = Ones((Mask) stuff->mask & (CWColormap - 1)); tmp = *((CARD32 *) &stuff[1] + cmap_offset); if ((tmp != CopyFromParent) && (tmp != None)) { - status = dixLookupResourceByType((pointer *) &cmap, tmp, + status = dixLookupResourceByType((void **) &cmap, tmp, XRT_COLORMAP, client, DixReadAccess); if (status != Success) @@ -1214,7 +1202,7 @@ ProcScreenSaverUnsetAttributes(ClientPtr client) PanoramiXRes *draw; int rc, i; - rc = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, + rc = dixLookupResourceByClass((void **) &draw, stuff->drawable, XRC_DRAWABLE, client, DixWriteAccess); if (rc != Success) return (rc == BadValue) ? BadDrawable : rc; @@ -1273,7 +1261,7 @@ ProcScreenSaverSuspend(ClientPtr client) this->count = 1; this->clientResource = FakeClientID(client->index); - if (!AddResource(this->clientResource, SuspendType, (pointer) this)) { + if (!AddResource(this->clientResource, SuspendType, (void *) this)) { free(this); return BadAlloc; } diff --git a/xorg-server/Xext/security.c b/xorg-server/Xext/security.c index dce3c9fba..b7c53a461 100644 --- a/xorg-server/Xext/security.c +++ b/xorg-server/Xext/security.c @@ -169,7 +169,7 @@ SecurityLookupRequestName(ClientPtr client) */ static int -SecurityDeleteAuthorization(pointer value, XID id) +SecurityDeleteAuthorization(void *value, XID id) { SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr) value; unsigned short name_len, data_len; @@ -223,7 +223,7 @@ SecurityDeleteAuthorization(pointer value, XID id) /* resource delete function for RTEventClient */ static int -SecurityDeleteAuthorizationEventClient(pointer value, XID id) +SecurityDeleteAuthorizationEventClient(void *value, XID id) { OtherClientsPtr pEventClient, prev = NULL; SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr) value; @@ -296,7 +296,7 @@ SecurityComputeAuthorizationTimeout(SecurityAuthorizationPtr pAuth, */ static CARD32 -SecurityAuthorizationExpired(OsTimerPtr timer, CARD32 time, pointer pval) +SecurityAuthorizationExpired(OsTimerPtr timer, CARD32 time, void *pval) { SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr) pval; @@ -382,7 +382,7 @@ SecurityEventSelectForAuthorization(SecurityAuthorizationPtr pAuth, pEventClient->mask = mask; pEventClient->resource = FakeClientID(client->index); pEventClient->next = pAuth->eventClients; - if (!AddResource(pEventClient->resource, RTEventClient, (pointer) pAuth)) { + if (!AddResource(pEventClient->resource, RTEventClient, (void *) pAuth)) { free(pEventClient); return BadAlloc; } @@ -454,7 +454,7 @@ ProcSecurityGenerateAuthorization(ClientPtr client) vgi.group = group; vgi.valid = FALSE; - CallCallbacks(&SecurityValidateGroupCallback, (pointer) &vgi); + CallCallbacks(&SecurityValidateGroupCallback, (void *) &vgi); /* if nobody said they recognized it, it's an error */ @@ -574,7 +574,7 @@ ProcSecurityRevokeAuthorization(ClientPtr client) REQUEST_SIZE_MATCH(xSecurityRevokeAuthorizationReq); - rc = dixLookupResourceByType((pointer *) &pAuth, stuff->authId, + rc = dixLookupResourceByType((void **) &pAuth, stuff->authId, SecurityAuthorizationResType, client, DixDestroyAccess); if (rc != Success) @@ -692,7 +692,7 @@ SwapSecurityAuthorizationRevokedEvent(xSecurityAuthorizationRevokedEvent * from, */ static void -SecurityDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata) +SecurityDevice(CallbackListPtr *pcbl, void *unused, void *calldata) { XaceDeviceAccessRec *rec = calldata; SecurityStateRec *subj, *obj; @@ -736,7 +736,7 @@ SecurityDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata) */ static void -SecurityResource(CallbackListPtr *pcbl, pointer unused, pointer calldata) +SecurityResource(CallbackListPtr *pcbl, void *unused, void *calldata) { XaceResourceAccessRec *rec = calldata; SecurityStateRec *subj, *obj; @@ -784,7 +784,7 @@ SecurityResource(CallbackListPtr *pcbl, pointer unused, pointer calldata) } static void -SecurityExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata) +SecurityExtension(CallbackListPtr *pcbl, void *unused, void *calldata) { XaceExtAccessRec *rec = calldata; SecurityStateRec *subj; @@ -807,7 +807,7 @@ SecurityExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata) } static void -SecurityServer(CallbackListPtr *pcbl, pointer unused, pointer calldata) +SecurityServer(CallbackListPtr *pcbl, void *unused, void *calldata) { XaceServerAccessRec *rec = calldata; SecurityStateRec *subj, *obj; @@ -826,7 +826,7 @@ SecurityServer(CallbackListPtr *pcbl, pointer unused, pointer calldata) } static void -SecurityClient(CallbackListPtr *pcbl, pointer unused, pointer calldata) +SecurityClient(CallbackListPtr *pcbl, void *unused, void *calldata) { XaceClientAccessRec *rec = calldata; SecurityStateRec *subj, *obj; @@ -845,7 +845,7 @@ SecurityClient(CallbackListPtr *pcbl, pointer unused, pointer calldata) } static void -SecurityProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata) +SecurityProperty(CallbackListPtr *pcbl, void *unused, void *calldata) { XacePropertyAccessRec *rec = calldata; SecurityStateRec *subj, *obj; @@ -867,7 +867,7 @@ SecurityProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata) } static void -SecuritySend(CallbackListPtr *pcbl, pointer unused, pointer calldata) +SecuritySend(CallbackListPtr *pcbl, void *unused, void *calldata) { XaceSendAccessRec *rec = calldata; SecurityStateRec *subj, *obj; @@ -899,7 +899,7 @@ SecuritySend(CallbackListPtr *pcbl, pointer unused, pointer calldata) } static void -SecurityReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata) +SecurityReceive(CallbackListPtr *pcbl, void *unused, void *calldata) { XaceReceiveAccessRec *rec = calldata; SecurityStateRec *subj, *obj; @@ -940,7 +940,7 @@ SecurityReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata) */ static void -SecurityClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata) +SecurityClientState(CallbackListPtr *pcbl, void *unused, void *calldata) { NewClientInfoRec *pci = calldata; SecurityStateRec *state; @@ -959,7 +959,7 @@ SecurityClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata) case ClientStateRunning: state->authId = AuthorizationIDOfClient(pci->client); - rc = dixLookupResourceByType((pointer *) &pAuth, state->authId, + rc = dixLookupResourceByType((void **) &pAuth, state->authId, SecurityAuthorizationResType, serverClient, DixGetAttrAccess); if (rc == Success) { @@ -975,7 +975,7 @@ SecurityClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata) case ClientStateGone: case ClientStateRetained: - rc = dixLookupResourceByType((pointer *) &pAuth, state->authId, + rc = dixLookupResourceByType((void **) &pAuth, state->authId, SecurityAuthorizationResType, serverClient, DixGetAttrAccess); if (rc == Success && state->live) { diff --git a/xorg-server/Xext/shape.c b/xorg-server/Xext/shape.c index dfe6fe70b..c6ff360ac 100644 --- a/xorg-server/Xext/shape.c +++ b/xorg-server/Xext/shape.c @@ -52,11 +52,11 @@ in this Software without prior written authorization from The Open Group. typedef RegionPtr (*CreateDftPtr) (WindowPtr /* pWin */ ); -static int ShapeFreeClient(pointer /* data */ , - XID /* id */ +static int ShapeFreeClient(void * /* data */ , + XID /* id */ ); -static int ShapeFreeEvents(pointer /* data */ , - XID /* id */ +static int ShapeFreeEvents(void * /* data */ , + XID /* id */ ); static void SShapeNotifyEvent(xShapeNotifyEvent * /* from */ , xShapeNotifyEvent * /* to */ @@ -307,7 +307,7 @@ ProcPanoramiXShapeRectangles(ClientPtr client) REQUEST_AT_LEAST_SIZE(xShapeRectanglesReq); - result = dixLookupResourceByType((pointer *) &win, stuff->dest, XRT_WINDOW, + result = dixLookupResourceByType((void **) &win, stuff->dest, XRT_WINDOW, client, DixWriteAccess); if (result != Success) return result; @@ -362,7 +362,7 @@ ProcShapeMask(ClientPtr client) if (stuff->src == None) srcRgn = 0; else { - rc = dixLookupResourceByType((pointer *) &pPixmap, stuff->src, + rc = dixLookupResourceByType((void **) &pPixmap, stuff->src, RT_PIXMAP, client, DixReadAccess); if (rc != Success) return rc; @@ -405,13 +405,13 @@ ProcPanoramiXShapeMask(ClientPtr client) REQUEST_SIZE_MATCH(xShapeMaskReq); - result = dixLookupResourceByType((pointer *) &win, stuff->dest, XRT_WINDOW, + result = dixLookupResourceByType((void **) &win, stuff->dest, XRT_WINDOW, client, DixWriteAccess); if (result != Success) return result; if (stuff->src != None) { - result = dixLookupResourceByType((pointer *) &pmap, stuff->src, + result = dixLookupResourceByType((void **) &pmap, stuff->src, XRT_PIXMAP, client, DixReadAccess); if (result != Success) return result; @@ -533,12 +533,12 @@ ProcPanoramiXShapeCombine(ClientPtr client) REQUEST_AT_LEAST_SIZE(xShapeCombineReq); - result = dixLookupResourceByType((pointer *) &win, stuff->dest, XRT_WINDOW, + result = dixLookupResourceByType((void **) &win, stuff->dest, XRT_WINDOW, client, DixWriteAccess); if (result != Success) return result; - result = dixLookupResourceByType((pointer *) &win2, stuff->src, XRT_WINDOW, + result = dixLookupResourceByType((void **) &win2, stuff->src, XRT_WINDOW, client, DixReadAccess); if (result != Success) return result; @@ -604,7 +604,7 @@ ProcPanoramiXShapeOffset(ClientPtr client) REQUEST_AT_LEAST_SIZE(xShapeOffsetReq); - result = dixLookupResourceByType((pointer *) &win, stuff->dest, XRT_WINDOW, + result = dixLookupResourceByType((void **) &win, stuff->dest, XRT_WINDOW, client, DixWriteAccess); if (result != Success) return result; @@ -686,7 +686,7 @@ ProcShapeQueryExtents(ClientPtr client) } /*ARGSUSED*/ static int -ShapeFreeClient(pointer data, XID id) +ShapeFreeClient(void *data, XID id) { ShapeEventPtr pShapeEvent; WindowPtr pWin; @@ -695,7 +695,7 @@ ShapeFreeClient(pointer data, XID id) pShapeEvent = (ShapeEventPtr) data; pWin = pShapeEvent->window; - rc = dixLookupResourceByType((pointer *) &pHead, pWin->drawable.id, + rc = dixLookupResourceByType((void **) &pHead, pWin->drawable.id, ShapeEventType, serverClient, DixReadAccess); if (rc == Success) { pPrev = 0; @@ -708,12 +708,12 @@ ShapeFreeClient(pointer data, XID id) *pHead = pShapeEvent->next; } } - free((pointer) pShapeEvent); + free((void *) pShapeEvent); return 1; } /*ARGSUSED*/ static int -ShapeFreeEvents(pointer data, XID id) +ShapeFreeEvents(void *data, XID id) { ShapeEventPtr *pHead, pCur, pNext; @@ -721,9 +721,9 @@ ShapeFreeEvents(pointer data, XID id) for (pCur = *pHead; pCur; pCur = pNext) { pNext = pCur->next; FreeResource(pCur->clientResource, ClientType); - free((pointer) pCur); + free((void *) pCur); } - free((pointer) pHead); + free((void *) pHead); return 1; } @@ -740,7 +740,7 @@ ProcShapeSelectInput(ClientPtr client) rc = dixLookupWindow(&pWin, stuff->window, client, DixReceiveAccess); if (rc != Success) return rc; - rc = dixLookupResourceByType((pointer *) &pHead, pWin->drawable.id, + rc = dixLookupResourceByType((void **) &pHead, pWin->drawable.id, ShapeEventType, client, DixWriteAccess); if (rc != Success && rc != BadValue) return rc; @@ -770,10 +770,10 @@ ProcShapeSelectInput(ClientPtr client) */ clientResource = FakeClientID(client->index); pNewShapeEvent->clientResource = clientResource; - if (!AddResource(clientResource, ClientType, (pointer) pNewShapeEvent)) + if (!AddResource(clientResource, ClientType, (void *) pNewShapeEvent)) 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 * the list may be arbitrarily rearranged which cannot be * done through the resource database. @@ -782,7 +782,7 @@ ProcShapeSelectInput(ClientPtr client) pHead = malloc(sizeof(ShapeEventPtr)); if (!pHead || !AddResource(pWin->drawable.id, ShapeEventType, - (pointer) pHead)) { + (void *) pHead)) { FreeResource(clientResource, RT_NONE); return BadAlloc; } @@ -831,7 +831,7 @@ SendShapeNotify(WindowPtr pWin, int which) BYTE shaped; int rc; - rc = dixLookupResourceByType((pointer *) &pHead, pWin->drawable.id, + rc = dixLookupResourceByType((void **) &pHead, pWin->drawable.id, ShapeEventType, serverClient, DixReadAccess); if (rc != Success) return; @@ -909,7 +909,7 @@ ProcShapeInputSelected(ClientPtr client) rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); if (rc != Success) return rc; - rc = dixLookupResourceByType((pointer *) &pHead, pWin->drawable.id, + rc = dixLookupResourceByType((void **) &pHead, pWin->drawable.id, ShapeEventType, client, DixReadAccess); if (rc != Success && rc != BadValue) return rc; diff --git a/xorg-server/Xext/shm.c b/xorg-server/Xext/shm.c index 2cf720ed7..31c19e346 100644 --- a/xorg-server/Xext/shm.c +++ b/xorg-server/Xext/shm.c @@ -101,14 +101,10 @@ typedef struct _ShmScrPrivateRec { } ShmScrPrivateRec; static PixmapPtr fbShmCreatePixmap(XSHM_CREATE_PIXMAP_ARGS); -static int ShmDetachSegment(pointer /* value */ , - XID /* shmseg */ - ); -static void ShmResetProc(ExtensionEntry * /* extEntry */ - ); -static void SShmCompletionEvent(xShmCompletionEvent * /* from */ , - xShmCompletionEvent * /* to */ - ); +static int ShmDetachSegment(void *value, XID shmseg); +static void ShmResetProc(ExtensionEntry *extEntry); +static void SShmCompletionEvent(xShmCompletionEvent *from, + xShmCompletionEvent *to); static Bool ShmDestroyPixmap(PixmapPtr pPixmap); @@ -132,7 +128,7 @@ static ShmFuncs fbFuncs = { fbShmCreatePixmap, NULL }; #define VERIFY_SHMSEG(shmseg,shmdesc,client) \ { \ int tmprc; \ - tmprc = dixLookupResourceByType((pointer *)&(shmdesc), shmseg, ShmSegType, \ + tmprc = dixLookupResourceByType((void **)&(shmdesc), shmseg, ShmSegType, \ client, DixReadAccess); \ if (tmprc != Success) \ return tmprc; \ @@ -262,7 +258,7 @@ ShmDestroyPixmap(PixmapPtr pPixmap) shmdesc = (ShmDescPtr) dixLookupPrivate(&pPixmap->devPrivates, shmPixmapPrivateKey); if (shmdesc) - ShmDetachSegment((pointer) shmdesc, pPixmap->drawable.id); + ShmDetachSegment((void *) shmdesc, pPixmap->drawable.id); } pScreen->DestroyPixmap = screen_priv->destroyPixmap; @@ -442,13 +438,13 @@ ProcShmAttach(ClientPtr client) shmdesc->next = Shmsegs; Shmsegs = shmdesc; } - if (!AddResource(stuff->shmseg, ShmSegType, (pointer) shmdesc)) + if (!AddResource(stuff->shmseg, ShmSegType, (void *) shmdesc)) return BadAlloc; return Success; } /*ARGSUSED*/ static int -ShmDetachSegment(pointer value, /* must conform to DeleteType */ +ShmDetachSegment(void *value, /* must conform to DeleteType */ XID shmseg) { ShmDescPtr shmdesc = (ShmDescPtr) value; @@ -748,12 +744,12 @@ ProcPanoramiXShmPutImage(ClientPtr client) REQUEST(xShmPutImageReq); REQUEST_SIZE_MATCH(xShmPutImageReq); - result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, + result = dixLookupResourceByClass((void **) &draw, stuff->drawable, XRC_DRAWABLE, client, DixWriteAccess); if (result != Success) return (result == BadValue) ? BadDrawable : result; - result = dixLookupResourceByType((pointer *) &gc, stuff->gc, + result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, client, DixReadAccess); if (result != Success) return result; @@ -802,7 +798,7 @@ ProcPanoramiXShmGetImage(ClientPtr client) return BadValue; } - rc = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, + rc = dixLookupResourceByClass((void **) &draw, stuff->drawable, XRC_DRAWABLE, client, DixWriteAccess); if (rc != Success) return (rc == BadValue) ? BadDrawable : rc; @@ -999,7 +995,7 @@ ProcPanoramiXShmCreatePixmap(ClientPtr client) shmdesc->refcnt++; pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER; 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; break; } @@ -1035,7 +1031,7 @@ fbShmCreatePixmap(ScreenPtr pScreen, if (!(*pScreen->ModifyPixmapHeader) (pPixmap, width, height, depth, BitsPerPixel(depth), PixmapBytePad(width, depth), - (pointer) addr)) { + (void *) addr)) { (*pScreen->DestroyPixmap) (pPixmap); return NullPixmap; } @@ -1114,7 +1110,7 @@ ProcShmCreatePixmap(ClientPtr client) shmdesc->refcnt++; pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pMap->drawable.id = stuff->pid; - if (AddResource(stuff->pid, RT_PIXMAP, (pointer) pMap)) { + if (AddResource(stuff->pid, RT_PIXMAP, (void *) pMap)) { return Success; } } @@ -1191,7 +1187,7 @@ ProcShmAttachFd(ClientPtr client) shmdesc->next = Shmsegs; Shmsegs = shmdesc; - if (!AddResource(stuff->shmseg, ShmSegType, (pointer) shmdesc)) + if (!AddResource(stuff->shmseg, ShmSegType, (void *) shmdesc)) return BadAlloc; return Success; } @@ -1282,7 +1278,7 @@ ProcShmCreateSegment(ClientPtr client) shmdesc->next = Shmsegs; Shmsegs = shmdesc; - if (!AddResource(stuff->shmseg, ShmSegType, (pointer) shmdesc)) { + if (!AddResource(stuff->shmseg, ShmSegType, (void *) shmdesc)) { close(fd); return BadAlloc; } diff --git a/xorg-server/Xext/sleepuntil.c b/xorg-server/Xext/sleepuntil.c index 52e22b4a6..993c028b8 100644 --- a/xorg-server/Xext/sleepuntil.c +++ b/xorg-server/Xext/sleepuntil.c @@ -46,10 +46,10 @@ typedef struct _Sertafied { ClientPtr pClient; XID id; void (*notifyFunc) (ClientPtr /* client */ , - pointer /* closure */ + void * /* closure */ ); - pointer closure; + void *closure; } SertafiedRec, *SertafiedPtr; static SertafiedPtr pPending; @@ -58,24 +58,24 @@ static Bool BlockHandlerRegistered; static int SertafiedGeneration; static void ClientAwaken(ClientPtr /* client */ , - pointer /* closure */ + void * /* closure */ ); -static int SertafiedDelete(pointer /* value */ , - XID /* id */ +static int SertafiedDelete(void * /* value */ , + XID /* id */ ); -static void SertafiedBlockHandler(pointer /* data */ , +static void SertafiedBlockHandler(void * /* data */ , OSTimePtr /* wt */ , - pointer /* LastSelectMask */ + void * /* LastSelectMask */ ); -static void SertafiedWakeupHandler(pointer /* data */ , - int /* i */ , - pointer /* LastSelectMask */ +static void SertafiedWakeupHandler(void * /* data */ , + int /* i */ , + void * /* LastSelectMask */ ); int ClientSleepUntil(ClientPtr client, TimeStamp *revive, - void (*notifyFunc) (ClientPtr, pointer), pointer closure) + void (*notifyFunc) (ClientPtr, void *), void *closure) { SertafiedPtr pRequest, pReq, pPrev; @@ -97,14 +97,14 @@ ClientSleepUntil(ClientPtr client, if (!BlockHandlerRegistered) { if (!RegisterBlockAndWakeupHandlers(SertafiedBlockHandler, SertafiedWakeupHandler, - (pointer) 0)) { + (void *) 0)) { free(pRequest); return FALSE; } BlockHandlerRegistered = TRUE; } pRequest->notifyFunc = 0; - if (!AddResource(pRequest->id, SertafiedResType, (pointer) pRequest)) + if (!AddResource(pRequest->id, SertafiedResType, (void *) pRequest)) return FALSE; if (!notifyFunc) notifyFunc = ClientAwaken; @@ -126,14 +126,14 @@ ClientSleepUntil(ClientPtr client, } static void -ClientAwaken(ClientPtr client, pointer closure) +ClientAwaken(ClientPtr client, void *closure) { if (!client->clientGone) AttendClient(client); } static int -SertafiedDelete(pointer value, XID id) +SertafiedDelete(void *value, XID id) { SertafiedPtr pRequest = (SertafiedPtr) value; SertafiedPtr pReq, pPrev; @@ -154,7 +154,7 @@ SertafiedDelete(pointer value, XID id) } static void -SertafiedBlockHandler(pointer data, OSTimePtr wt, pointer LastSelectMask) +SertafiedBlockHandler(void *data, OSTimePtr wt, void *LastSelectMask) { SertafiedPtr pReq, pNext; unsigned long delay; @@ -186,7 +186,7 @@ SertafiedBlockHandler(pointer data, OSTimePtr wt, pointer LastSelectMask) } static void -SertafiedWakeupHandler(pointer data, int i, pointer LastSelectMask) +SertafiedWakeupHandler(void *data, int i, void *LastSelectMask) { SertafiedPtr pReq, pNext; TimeStamp now; @@ -203,7 +203,7 @@ SertafiedWakeupHandler(pointer data, int i, pointer LastSelectMask) } if (!pPending) { RemoveBlockAndWakeupHandlers(SertafiedBlockHandler, - SertafiedWakeupHandler, (pointer) 0); + SertafiedWakeupHandler, (void *) 0); BlockHandlerRegistered = FALSE; } } diff --git a/xorg-server/Xext/sleepuntil.h b/xorg-server/Xext/sleepuntil.h index 5c7084842..e9b8388f9 100644 --- a/xorg-server/Xext/sleepuntil.h +++ b/xorg-server/Xext/sleepuntil.h @@ -36,7 +36,7 @@ extern int ClientSleepUntil(ClientPtr client, TimeStamp *revive, void (*notifyFunc) (ClientPtr /* client */ , - pointer /* closure */ - ), pointer Closure); + void * /* closure */ + ), void *Closure); #endif diff --git a/xorg-server/Xext/sync.c b/xorg-server/Xext/sync.c index 1b31e7a4e..7129e9833 100644 --- a/xorg-server/Xext/sync.c +++ b/xorg-server/Xext/sync.c @@ -324,7 +324,7 @@ SyncInitTrigger(ClientPtr client, SyncTrigger * pTrigger, XID syncObject, if (changes & XSyncCACounter) { if (syncObject == None) pSync = NULL; - else if (Success != (rc = dixLookupResourceByType((pointer *) &pSync, + else if (Success != (rc = dixLookupResourceByType((void **) &pSync, syncObject, resType, client, DixReadAccess))) { @@ -344,7 +344,7 @@ SyncInitTrigger(ClientPtr client, SyncTrigger * pTrigger, XID syncObject, pCounter = (SyncCounter *) pSync; if (IsSystemCounter(pCounter)) { - (*pCounter->pSysCounterInfo->QueryValue) ((pointer) pCounter, + (*pCounter->pSysCounterInfo->QueryValue) ((void *) pCounter, &pCounter->value); } } @@ -931,7 +931,7 @@ SyncCreateFenceFromFD(ClientPtr client, DrawablePtr pDraw, XID id, int fd, BOOL return status; } - if (!AddResource(id, RTFence, (pointer) pFence)) + if (!AddResource(id, RTFence, (void *) pFence)) return BadAlloc; return Success; @@ -961,7 +961,7 @@ SyncCreateCounter(ClientPtr client, XSyncCounter id, CARD64 initialvalue) pCounter->value = initialvalue; pCounter->pSysCounterInfo = NULL; - if (!AddResource(id, RTCounter, (pointer) pCounter)) + if (!AddResource(id, RTCounter, (void *) pCounter)) return NULL; return pCounter; @@ -1021,7 +1021,7 @@ SyncCreateSystemCounter(const char *name, } void -SyncDestroySystemCounter(pointer pSysCounter) +SyncDestroySystemCounter(void *pSysCounter) { SyncCounter *pCounter = (SyncCounter *) pSysCounter; @@ -1119,7 +1119,7 @@ SyncComputeBracketValues(SyncCounter * pCounter) } } /* end for each trigger */ - (*psci->BracketValues) ((pointer) pCounter, pnewltval, pnewgtval); + (*psci->BracketValues) ((void *) pCounter, pnewltval, pnewgtval); } @@ -1433,7 +1433,7 @@ ProcSyncSetCounter(ClientPtr client) REQUEST_SIZE_MATCH(xSyncSetCounterReq); - rc = dixLookupResourceByType((pointer *) &pCounter, stuff->cid, RTCounter, + rc = dixLookupResourceByType((void **) &pCounter, stuff->cid, RTCounter, client, DixWriteAccess); if (rc != Success) return rc; @@ -1462,7 +1462,7 @@ ProcSyncChangeCounter(ClientPtr client) REQUEST_SIZE_MATCH(xSyncChangeCounterReq); - rc = dixLookupResourceByType((pointer *) &pCounter, stuff->cid, RTCounter, + rc = dixLookupResourceByType((void **) &pCounter, stuff->cid, RTCounter, client, DixWriteAccess); if (rc != Success) return rc; @@ -1495,7 +1495,7 @@ ProcSyncDestroyCounter(ClientPtr client) REQUEST_SIZE_MATCH(xSyncDestroyCounterReq); - rc = dixLookupResourceByType((pointer *) &pCounter, stuff->counter, + rc = dixLookupResourceByType((void **) &pCounter, stuff->counter, RTCounter, client, DixDestroyAccess); if (rc != Success) return rc; @@ -1656,14 +1656,14 @@ ProcSyncQueryCounter(ClientPtr client) REQUEST_SIZE_MATCH(xSyncQueryCounterReq); - rc = dixLookupResourceByType((pointer *) &pCounter, stuff->counter, + rc = dixLookupResourceByType((void **) &pCounter, stuff->counter, RTCounter, client, DixReadAccess); if (rc != Success) return rc; /* if system counter, ask it what the current value is */ if (IsSystemCounter(pCounter)) { - (*pCounter->pSysCounterInfo->QueryValue) ((pointer) pCounter, + (*pCounter->pSysCounterInfo->QueryValue) ((void *) pCounter, &pCounter->value); } @@ -1781,7 +1781,7 @@ ProcSyncChangeAlarm(ClientPtr client) REQUEST_AT_LEAST_SIZE(xSyncChangeAlarmReq); - status = dixLookupResourceByType((pointer *) &pAlarm, stuff->alarm, RTAlarm, + status = dixLookupResourceByType((void **) &pAlarm, stuff->alarm, RTAlarm, client, DixWriteAccess); if (status != Success) return status; @@ -1822,7 +1822,7 @@ ProcSyncQueryAlarm(ClientPtr client) REQUEST_SIZE_MATCH(xSyncQueryAlarmReq); - rc = dixLookupResourceByType((pointer *) &pAlarm, stuff->alarm, RTAlarm, + rc = dixLookupResourceByType((void **) &pAlarm, stuff->alarm, RTAlarm, client, DixReadAccess); if (rc != Success) return rc; @@ -1879,7 +1879,7 @@ ProcSyncDestroyAlarm(ClientPtr client) REQUEST_SIZE_MATCH(xSyncDestroyAlarmReq); - rc = dixLookupResourceByType((pointer *) &pAlarm, stuff->alarm, RTAlarm, + rc = dixLookupResourceByType((void **) &pAlarm, stuff->alarm, RTAlarm, client, DixDestroyAccess); if (rc != Success) return rc; @@ -1909,7 +1909,7 @@ ProcSyncCreateFence(ClientPtr client) miSyncInitFence(pDraw->pScreen, pFence, stuff->initially_triggered); - if (!AddResource(stuff->fid, RTFence, (pointer) pFence)) + if (!AddResource(stuff->fid, RTFence, (void *) pFence)) return BadAlloc; return client->noClientException; @@ -1928,7 +1928,7 @@ FreeFence(void *obj, XID id) int 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); if (rc != Success) @@ -1946,7 +1946,7 @@ ProcSyncTriggerFence(ClientPtr client) REQUEST_SIZE_MATCH(xSyncTriggerFenceReq); - rc = dixLookupResourceByType((pointer *) &pFence, stuff->fid, RTFence, + rc = dixLookupResourceByType((void **) &pFence, stuff->fid, RTFence, client, DixWriteAccess); if (rc != Success) return rc; @@ -1965,7 +1965,7 @@ ProcSyncResetFence(ClientPtr client) REQUEST_SIZE_MATCH(xSyncResetFenceReq); - rc = dixLookupResourceByType((pointer *) &pFence, stuff->fid, RTFence, + rc = dixLookupResourceByType((void **) &pFence, stuff->fid, RTFence, client, DixWriteAccess); if (rc != Success) return rc; @@ -1987,7 +1987,7 @@ ProcSyncDestroyFence(ClientPtr client) REQUEST_SIZE_MATCH(xSyncDestroyFenceReq); - rc = dixLookupResourceByType((pointer *) &pFence, stuff->fid, RTFence, + rc = dixLookupResourceByType((void **) &pFence, stuff->fid, RTFence, client, DixDestroyAccess); if (rc != Success) return rc; @@ -2006,7 +2006,7 @@ ProcSyncQueryFence(ClientPtr client) REQUEST_SIZE_MATCH(xSyncQueryFenceReq); - rc = dixLookupResourceByType((pointer *) &pFence, stuff->fid, + rc = dixLookupResourceByType((void **) &pFence, stuff->fid, RTFence, client, DixReadAccess); if (rc != Success) return rc; @@ -2554,7 +2554,7 @@ SyncExtensionInit(void) * ***** SERVERTIME implementation - should go in its own file in OS directory? */ -static pointer ServertimeCounter; +static void *ServertimeCounter; static XSyncValue Now; static XSyncValue *pnext_time; @@ -2655,7 +2655,7 @@ typedef struct { } IdleCounterPriv; static void -IdleTimeQueryValue(pointer pCounter, CARD64 * pValue_return) +IdleTimeQueryValue(void *pCounter, CARD64 * pValue_return) { int deviceid; CARD32 idle; @@ -2672,7 +2672,7 @@ IdleTimeQueryValue(pointer pCounter, CARD64 * pValue_return) } static void -IdleTimeBlockHandler(pointer pCounter, struct timeval **wt, pointer LastSelectMask) +IdleTimeBlockHandler(void *pCounter, struct timeval **wt, void *LastSelectMask) { SyncCounter *counter = pCounter; IdleCounterPriv *priv = SysCounterGetPrivate(counter); @@ -2768,7 +2768,7 @@ IdleTimeCheckBrackets(SyncCounter *counter, XSyncValue idle, XSyncValue *less, X } static void -IdleTimeWakeupHandler(pointer pCounter, int rc, pointer LastSelectMask) +IdleTimeWakeupHandler(void *pCounter, int rc, void *LastSelectMask) { SyncCounter *counter = pCounter; IdleCounterPriv *priv = SysCounterGetPrivate(counter); @@ -2802,7 +2802,7 @@ IdleTimeWakeupHandler(pointer pCounter, int rc, pointer LastSelectMask) } static void -IdleTimeBracketValues(pointer pCounter, CARD64 * pbracket_less, +IdleTimeBracketValues(void *pCounter, CARD64 * pbracket_less, CARD64 * pbracket_greater) { SyncCounter *counter = pCounter; diff --git a/xorg-server/Xext/syncsrv.h b/xorg-server/Xext/syncsrv.h index 45fca04da..8c2c00df0 100644 --- a/xorg-server/Xext/syncsrv.h +++ b/xorg-server/Xext/syncsrv.h @@ -66,10 +66,10 @@ typedef enum { XSyncCounterUnrestricted } SyncCounterType; -typedef void (*SyncSystemCounterQueryValue)(pointer counter, +typedef void (*SyncSystemCounterQueryValue)(void *counter, CARD64 *value_return ); -typedef void (*SyncSystemCounterBracketValues)(pointer counter, +typedef void (*SyncSystemCounterBracketValues)(void *counter, CARD64 *pbracket_less, CARD64 *pbracket_greater ); @@ -132,7 +132,7 @@ extern void SyncChangeCounter(SyncCounter *pCounter, CARD64 new_value ); -extern void SyncDestroySystemCounter(pointer pCounter); +extern void SyncDestroySystemCounter(void *pCounter); extern SyncCounter *SyncInitDeviceIdleTime(DeviceIntPtr dev); extern void SyncRemoveDeviceIdleTime(SyncCounter *counter); diff --git a/xorg-server/Xext/xace.c b/xorg-server/Xext/xace.c index 2bfe5ecf4..b8d5b4090 100644 --- a/xorg-server/Xext/xace.c +++ b/xorg-server/Xext/xace.c @@ -124,9 +124,9 @@ XaceHook(int hook, ...) u.res.client = va_arg(ap, ClientPtr); u.res.id = va_arg(ap, XID); 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.parent = va_arg(ap, pointer); + u.res.parent = va_arg(ap, void *); u.res.access_mode = va_arg(ap, Mask); u.res.status = Success; /* default allow */ @@ -290,7 +290,7 @@ XaceCensorImage(ClientPtr client, pPix = GetScratchPixmapHeader(pDraw->pScreen, w, h, depth, bitsPerPixel, - widthBytesLine, (pointer) pBuf); + widthBytesLine, (void *) pBuf); if (!pPix) { failed = TRUE; goto failSafe; diff --git a/xorg-server/Xext/xacestr.h b/xorg-server/Xext/xacestr.h index 989b0339f..6fe8eecc8 100644 --- a/xorg-server/Xext/xacestr.h +++ b/xorg-server/Xext/xacestr.h @@ -40,9 +40,9 @@ typedef struct { ClientPtr client; XID id; RESTYPE rtype; - pointer res; + void *res; RESTYPE ptype; - pointer parent; + void *parent; Mask access_mode; int status; } XaceResourceAccessRec; diff --git a/xorg-server/Xext/xres.c b/xorg-server/Xext/xres.c index cac2e12ab..32e8c8135 100644..100755 --- a/xorg-server/Xext/xres.c +++ b/xorg-server/Xext/xres.c @@ -193,7 +193,6 @@ DestroyConstructResourceBytesCtx(ConstructResourceBytesCtx *ctx) static int ProcXResQueryVersion(ClientPtr client) { - REQUEST(xXResQueryVersionReq); xXResQueryVersionReply rep; REQUEST_SIZE_MATCH(xXResQueryVersionReq); @@ -266,7 +265,7 @@ ProcXResQueryClients(ClientPtr client) } static void -ResFindAllRes(pointer value, XID id, RESTYPE type, pointer cdata) +ResFindAllRes(void *value, XID id, RESTYPE type, void *cdata) { int *counts = (int *) cdata; @@ -363,7 +362,7 @@ ResGetApproxPixmapBytes(PixmapPtr pix) } static void -ResFindResourcePixmaps(pointer value, XID id, RESTYPE type, pointer cdata) +ResFindResourcePixmaps(void *value, XID id, RESTYPE type, void *cdata) { SizeType sizeFunc = GetResourceTypeSizeFunc(type); ResourceSizeRec size = { 0, 0, 0 }; @@ -374,7 +373,7 @@ ResFindResourcePixmaps(pointer value, XID id, RESTYPE type, pointer cdata) } static void -ResFindPixmaps(pointer value, XID id, pointer cdata) +ResFindPixmaps(void *value, XID id, void *cdata) { unsigned long *bytes = (unsigned long *) cdata; PixmapPtr pix = (PixmapPtr) value; @@ -383,7 +382,7 @@ ResFindPixmaps(pointer value, XID id, pointer cdata) } static void -ResFindWindowPixmaps(pointer value, XID id, pointer cdata) +ResFindWindowPixmaps(void *value, XID id, void *cdata) { unsigned long *bytes = (unsigned long *) cdata; WindowPtr pWin = (WindowPtr) value; @@ -396,7 +395,7 @@ ResFindWindowPixmaps(pointer value, XID id, pointer cdata) } static void -ResFindGCPixmaps(pointer value, XID id, pointer cdata) +ResFindGCPixmaps(void *value, XID id, void *cdata) { unsigned long *bytes = (unsigned long *) cdata; GCPtr pGC = (GCPtr) value; @@ -409,7 +408,7 @@ ResFindGCPixmaps(pointer value, XID id, pointer cdata) } static void -ResFindPicturePixmaps(pointer value, XID id, pointer cdata) +ResFindPicturePixmaps(void *value, XID id, void *cdata) { #ifdef RENDER ResFindResourcePixmaps(value, id, PictureType, cdata); @@ -417,7 +416,7 @@ ResFindPicturePixmaps(pointer value, XID id, pointer cdata) } static void -ResFindCompositeClientWindowPixmaps (pointer value, XID id, pointer cdata) +ResFindCompositeClientWindowPixmaps (void *value, XID id, void *cdata) { #ifdef COMPOSITE ResFindResourcePixmaps(value, id, CompositeClientWindowType, cdata); @@ -444,32 +443,32 @@ ProcXResQueryClientPixmapBytes(ClientPtr client) bytes = 0; FindClientResourcesByType(clients[clientID], RT_PIXMAP, ResFindPixmaps, - (pointer) (&bytes)); + (void *) (&bytes)); /* * Make sure win background pixmaps also held to account. */ FindClientResourcesByType(clients[clientID], RT_WINDOW, - ResFindWindowPixmaps, (pointer) (&bytes)); + ResFindWindowPixmaps, (void *) (&bytes)); /* * GC Tile & Stipple pixmaps too. */ FindClientResourcesByType(clients[clientID], RT_GC, - ResFindGCPixmaps, (pointer) (&bytes)); + ResFindGCPixmaps, (void *) (&bytes)); #ifdef RENDER /* Render extension picture pixmaps. */ FindClientResourcesByType(clients[clientID], PictureType, ResFindPicturePixmaps, - (pointer)(&bytes)); + (void *)(&bytes)); #endif #ifdef COMPOSITE /* Composite extension client window pixmaps. */ FindClientResourcesByType(clients[clientID], CompositeClientWindowType, ResFindCompositeClientWindowPixmaps, - (pointer)(&bytes)); + (void *)(&bytes)); #endif @@ -749,10 +748,10 @@ SwapXResQueryResourceBytes(struct xorg_list *response) FindRes */ static void -AddSubResourceSizeSpec(pointer value, +AddSubResourceSizeSpec(void *value, XID id, RESTYPE type, - pointer cdata) + void *cdata) { ConstructResourceBytesCtx *ctx = cdata; @@ -814,7 +813,7 @@ AddSubResourceSizeSpec(pointer value, FindRes */ static void -AddResourceSizeValue(pointer ptr, XID id, RESTYPE type, pointer cdata) +AddResourceSizeValue(void *ptr, XID id, RESTYPE type, void *cdata) { ConstructResourceBytesCtx *ctx = cdata; if (ctx->status == Success && @@ -884,7 +883,7 @@ AddResourceSizeValue(pointer ptr, XID id, RESTYPE type, pointer cdata) @param[in/out] cdata The context object that contains the resource type */ static void -AddResourceSizeValueWithResType(pointer ptr, XID id, pointer cdata) +AddResourceSizeValueWithResType(void *ptr, XID id, void *cdata) { ConstructResourceBytesCtx *ctx = cdata; AddResourceSizeValue(ptr, id, ctx->resType, cdata); @@ -902,7 +901,7 @@ AddResourceSizeValueWithResType(pointer ptr, XID id, pointer cdata) type FindAllRes */ static void -AddResourceSizeValueByResource(pointer ptr, XID id, RESTYPE type, pointer cdata) +AddResourceSizeValueByResource(void *ptr, XID id, RESTYPE type, void *cdata) { ConstructResourceBytesCtx *ctx = cdata; xXResResourceIdSpec *spec = ctx->curSpec; @@ -1097,7 +1096,6 @@ ProcResDispatch(ClientPtr client) static int SProcXResQueryVersion(ClientPtr client) { - REQUEST(xXResQueryVersionReq); REQUEST_SIZE_MATCH(xXResQueryVersionReq); return ProcXResQueryVersion(client); } diff --git a/xorg-server/Xext/xselinux_ext.c b/xorg-server/Xext/xselinux_ext.c index 3115f03ea..fb7b2d526 100644 --- a/xorg-server/Xext/xselinux_ext.c +++ b/xorg-server/Xext/xselinux_ext.c @@ -245,7 +245,7 @@ ProcSELinuxGetDrawableContext(ClientPtr client) } static int -ProcSELinuxGetPropertyContext(ClientPtr client, pointer privKey) +ProcSELinuxGetPropertyContext(ClientPtr client, void *privKey) { WindowPtr pWin; PropertyPtr pProp; @@ -269,7 +269,7 @@ ProcSELinuxGetPropertyContext(ClientPtr client, pointer privKey) } static int -ProcSELinuxGetSelectionContext(ClientPtr client, pointer privKey) +ProcSELinuxGetSelectionContext(ClientPtr client, void *privKey) { Selection *pSel; SELinuxObjectRec *obj; @@ -576,7 +576,7 @@ SProcSELinuxGetDrawableContext(ClientPtr client) } static int -SProcSELinuxGetPropertyContext(ClientPtr client, pointer privKey) +SProcSELinuxGetPropertyContext(ClientPtr client, void *privKey) { REQUEST(SELinuxGetPropertyContextReq); @@ -587,7 +587,7 @@ SProcSELinuxGetPropertyContext(ClientPtr client, pointer privKey) } static int -SProcSELinuxGetSelectionContext(ClientPtr client, pointer privKey) +SProcSELinuxGetSelectionContext(ClientPtr client, void *privKey) { REQUEST(SELinuxGetContextReq); diff --git a/xorg-server/Xext/xselinux_hooks.c b/xorg-server/Xext/xselinux_hooks.c index e9c7e93d7..376d57518 100644 --- a/xorg-server/Xext/xselinux_hooks.c +++ b/xorg-server/Xext/xselinux_hooks.c @@ -74,10 +74,10 @@ static Atom atom_client_ctx; static security_id_t unlabeled_sid; /* forward declarations */ -static void SELinuxScreen(CallbackListPtr *, pointer, pointer); +static void SELinuxScreen(CallbackListPtr *, void *, void *); /* "true" pointer value for use as callback data */ -static pointer truep = (pointer) 1; +static void *truep = (void *) 1; /* * Performs an SELinux permission check. @@ -147,7 +147,7 @@ SELinuxLabelClient(ClientPtr client) strncpy(subj->command, cmdname, COMMAND_LEN - 1); if (!cached) - free((void *) cmdname); /* const char * */ + free(cmdname); /* const char * */ } finish: @@ -171,7 +171,7 @@ SELinuxLabelInitial(void) SELinuxSubjectRec *subj; SELinuxObjectRec *obj; security_context_t ctx; - pointer unused; + void *unused; /* Do the serverClient */ subj = dixLookupPrivate(&serverClient->devPrivates, subjectKey); @@ -326,7 +326,7 @@ SELinuxLog(int type, const char *fmt, ...) */ static void -SELinuxDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata) +SELinuxDevice(CallbackListPtr *pcbl, void *unused, void *calldata) { XaceDeviceAccessRec *rec = calldata; SELinuxSubjectRec *subj; @@ -363,7 +363,7 @@ SELinuxDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata) } static void -SELinuxSend(CallbackListPtr *pcbl, pointer unused, pointer calldata) +SELinuxSend(CallbackListPtr *pcbl, void *unused, void *calldata) { XaceSendAccessRec *rec = calldata; SELinuxSubjectRec *subj; @@ -405,7 +405,7 @@ SELinuxSend(CallbackListPtr *pcbl, pointer unused, pointer calldata) } static void -SELinuxReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata) +SELinuxReceive(CallbackListPtr *pcbl, void *unused, void *calldata) { XaceReceiveAccessRec *rec = calldata; SELinuxSubjectRec *subj; @@ -443,7 +443,7 @@ SELinuxReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata) } static void -SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata) +SELinuxExtension(CallbackListPtr *pcbl, void *unused, void *calldata) { XaceExtAccessRec *rec = calldata; SELinuxSubjectRec *subj, *serv; @@ -484,7 +484,7 @@ SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata) } static void -SELinuxSelection(CallbackListPtr *pcbl, pointer unused, pointer calldata) +SELinuxSelection(CallbackListPtr *pcbl, void *unused, void *calldata) { XaceSelectionAccessRec *rec = calldata; SELinuxSubjectRec *subj; @@ -544,7 +544,7 @@ SELinuxSelection(CallbackListPtr *pcbl, pointer unused, pointer calldata) } static void -SELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata) +SELinuxProperty(CallbackListPtr *pcbl, void *unused, void *calldata) { XacePropertyAccessRec *rec = calldata; SELinuxSubjectRec *subj; @@ -608,7 +608,7 @@ SELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata) } static void -SELinuxResource(CallbackListPtr *pcbl, pointer unused, pointer calldata) +SELinuxResource(CallbackListPtr *pcbl, void *unused, void *calldata) { XaceResourceAccessRec *rec = calldata; SELinuxSubjectRec *subj; @@ -667,7 +667,7 @@ SELinuxResource(CallbackListPtr *pcbl, pointer unused, pointer calldata) } static void -SELinuxScreen(CallbackListPtr *pcbl, pointer is_saver, pointer calldata) +SELinuxScreen(CallbackListPtr *pcbl, void *is_saver, void *calldata) { XaceScreenAccessRec *rec = calldata; SELinuxSubjectRec *subj; @@ -699,7 +699,7 @@ SELinuxScreen(CallbackListPtr *pcbl, pointer is_saver, pointer calldata) } static void -SELinuxClient(CallbackListPtr *pcbl, pointer unused, pointer calldata) +SELinuxClient(CallbackListPtr *pcbl, void *unused, void *calldata) { XaceClientAccessRec *rec = calldata; SELinuxSubjectRec *subj; @@ -717,7 +717,7 @@ SELinuxClient(CallbackListPtr *pcbl, pointer unused, pointer calldata) } static void -SELinuxServer(CallbackListPtr *pcbl, pointer unused, pointer calldata) +SELinuxServer(CallbackListPtr *pcbl, void *unused, void *calldata) { XaceServerAccessRec *rec = calldata; SELinuxSubjectRec *subj; @@ -739,7 +739,7 @@ SELinuxServer(CallbackListPtr *pcbl, pointer unused, pointer calldata) */ static void -SELinuxClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata) +SELinuxClientState(CallbackListPtr *pcbl, void *unused, void *calldata) { NewClientInfoRec *pci = calldata; @@ -754,7 +754,7 @@ SELinuxClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata) } static void -SELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata) +SELinuxResourceState(CallbackListPtr *pcbl, void *unused, void *calldata) { ResourceStateInfoRec *rec = calldata; SELinuxSubjectRec *subj; diff --git a/xorg-server/Xext/xtest.c b/xorg-server/Xext/xtest.c index b0b974c78..9bd90be7f 100644 --- a/xorg-server/Xext/xtest.c +++ b/xorg-server/Xext/xtest.c @@ -125,7 +125,7 @@ ProcXTestCompareCursor(ClientPtr client) else if (stuff->cursor == XTestCurrentCursor) pCursor = GetSpriteCursor(ptr); else { - rc = dixLookupResourceByType((pointer *) &pCursor, stuff->cursor, + rc = dixLookupResourceByType((void **) &pCursor, stuff->cursor, RT_CURSOR, client, DixReadAccess); if (rc != Success) { client->errorValue = stuff->cursor; diff --git a/xorg-server/Xext/xvdisp.c b/xorg-server/Xext/xvdisp.c index 613867a6b..f2d49a2b8 100644 --- a/xorg-server/Xext/xvdisp.c +++ b/xorg-server/Xext/xvdisp.c @@ -994,7 +994,7 @@ ProcXvShmPutImage(ClientPtr client) if (!pImage) return BadMatch; - status = dixLookupResourceByType((pointer *) &shmdesc, stuff->shmseg, + status = dixLookupResourceByType((void **) &shmdesc, stuff->shmseg, ShmSegType, serverClient, DixReadAccess); if (status != Success) return status; @@ -1512,12 +1512,12 @@ XineramaXvStopVideo(ClientPtr client) REQUEST(xvStopVideoReq); REQUEST_SIZE_MATCH(xvStopVideoReq); - result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, + result = dixLookupResourceByClass((void **) &draw, stuff->drawable, XRC_DRAWABLE, client, DixWriteAccess); if (result != Success) return (result == BadValue) ? BadDrawable : result; - result = dixLookupResourceByType((pointer *) &port, stuff->port, + result = dixLookupResourceByType((void **) &port, stuff->port, XvXRTPort, client, DixReadAccess); if (result != Success) return result; @@ -1542,7 +1542,7 @@ XineramaXvSetPortAttribute(ClientPtr client) REQUEST_SIZE_MATCH(xvSetPortAttributeReq); - result = dixLookupResourceByType((pointer *) &port, stuff->port, + result = dixLookupResourceByType((void **) &port, stuff->port, XvXRTPort, client, DixReadAccess); if (result != Success) return result; @@ -1568,17 +1568,17 @@ XineramaXvShmPutImage(ClientPtr client) REQUEST_SIZE_MATCH(xvShmPutImageReq); - result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, + result = dixLookupResourceByClass((void **) &draw, stuff->drawable, XRC_DRAWABLE, client, DixWriteAccess); if (result != Success) return (result == BadValue) ? BadDrawable : result; - result = dixLookupResourceByType((pointer *) &gc, stuff->gc, + result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, client, DixReadAccess); if (result != Success) return result; - result = dixLookupResourceByType((pointer *) &port, stuff->port, + result = dixLookupResourceByType((void **) &port, stuff->port, XvXRTPort, client, DixReadAccess); if (result != Success) return result; @@ -1620,17 +1620,17 @@ XineramaXvPutImage(ClientPtr client) REQUEST_AT_LEAST_SIZE(xvPutImageReq); - result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, + result = dixLookupResourceByClass((void **) &draw, stuff->drawable, XRC_DRAWABLE, client, DixWriteAccess); if (result != Success) return (result == BadValue) ? BadDrawable : result; - result = dixLookupResourceByType((pointer *) &gc, stuff->gc, + result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, client, DixReadAccess); if (result != Success) return result; - result = dixLookupResourceByType((pointer *) &port, stuff->port, + result = dixLookupResourceByType((void **) &port, stuff->port, XvXRTPort, client, DixReadAccess); if (result != Success) return result; @@ -1668,17 +1668,17 @@ XineramaXvPutVideo(ClientPtr client) REQUEST_AT_LEAST_SIZE(xvPutVideoReq); - result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, + result = dixLookupResourceByClass((void **) &draw, stuff->drawable, XRC_DRAWABLE, client, DixWriteAccess); if (result != Success) return (result == BadValue) ? BadDrawable : result; - result = dixLookupResourceByType((pointer *) &gc, stuff->gc, + result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, client, DixReadAccess); if (result != Success) return result; - result = dixLookupResourceByType((pointer *) &port, stuff->port, + result = dixLookupResourceByType((void **) &port, stuff->port, XvXRTPort, client, DixReadAccess); if (result != Success) return result; @@ -1716,17 +1716,17 @@ XineramaXvPutStill(ClientPtr client) REQUEST_AT_LEAST_SIZE(xvPutImageReq); - result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, + result = dixLookupResourceByClass((void **) &draw, stuff->drawable, XRC_DRAWABLE, client, DixWriteAccess); if (result != Success) return (result == BadValue) ? BadDrawable : result; - result = dixLookupResourceByType((pointer *) &gc, stuff->gc, + result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, client, DixReadAccess); if (result != Success) return result; - result = dixLookupResourceByType((pointer *) &port, stuff->port, + result = dixLookupResourceByType((void **) &port, stuff->port, XvXRTPort, client, DixReadAccess); if (result != Success) return result; diff --git a/xorg-server/Xext/xvdix.h b/xorg-server/Xext/xvdix.h index 9c6160c3b..bb08cf4c7 100644 --- a/xorg-server/Xext/xvdix.h +++ b/xorg-server/Xext/xvdix.h @@ -200,7 +200,7 @@ typedef struct _XvPortRec { #define VALIDATE_XV_PORT(portID, pPort, mode)\ {\ - int rc = dixLookupResourceByType((pointer *)&(pPort), portID,\ + int rc = dixLookupResourceByType((void **)&(pPort), portID,\ XvRTPort, client, mode);\ if (rc != Success)\ return rc;\ diff --git a/xorg-server/Xext/xvmain.c b/xorg-server/Xext/xvmain.c index 6515f7e56..9020b2497 100644 --- a/xorg-server/Xext/xvmain.c +++ b/xorg-server/Xext/xvmain.c @@ -134,12 +134,12 @@ static Bool XvCloseScreen(ScreenPtr); static Bool XvDestroyPixmap(PixmapPtr); static Bool XvDestroyWindow(WindowPtr); static void XvResetProc(ExtensionEntry *); -static int XvdiDestroyGrab(pointer, XID); -static int XvdiDestroyEncoding(pointer, XID); -static int XvdiDestroyVideoNotify(pointer, XID); -static int XvdiDestroyPortNotify(pointer, XID); -static int XvdiDestroyVideoNotifyList(pointer, XID); -static int XvdiDestroyPort(pointer, XID); +static int XvdiDestroyGrab(void *, XID); +static int XvdiDestroyEncoding(void *, XID); +static int XvdiDestroyVideoNotify(void *, XID); +static int XvdiDestroyPortNotify(void *, XID); +static int XvdiDestroyVideoNotifyList(void *, XID); +static int XvdiDestroyPort(void *, XID); static int XvdiSendVideoNotify(XvPortPtr, DrawablePtr, int); /* @@ -450,20 +450,20 @@ XvdiVideoStopped(XvPortPtr pPort, int reason) } static int -XvdiDestroyPort(pointer pPort, XID id) +XvdiDestroyPort(void *pPort, XID id) { return (*((XvPortPtr) pPort)->pAdaptor->ddFreePort) (pPort); } static int -XvdiDestroyGrab(pointer pGrab, XID id) +XvdiDestroyGrab(void *pGrab, XID id) { ((XvGrabPtr) pGrab)->client = NULL; return Success; } static int -XvdiDestroyVideoNotify(pointer pn, XID id) +XvdiDestroyVideoNotify(void *pn, XID id) { /* JUST CLEAR OUT THE client POINTER FIELD */ @@ -472,7 +472,7 @@ XvdiDestroyVideoNotify(pointer pn, XID id) } static int -XvdiDestroyPortNotify(pointer pn, XID id) +XvdiDestroyPortNotify(void *pn, XID id) { /* JUST CLEAR OUT THE client POINTER FIELD */ @@ -481,7 +481,7 @@ XvdiDestroyPortNotify(pointer pn, XID id) } static int -XvdiDestroyVideoNotifyList(pointer pn, XID id) +XvdiDestroyVideoNotifyList(void *pn, XID id) { XvVideoNotifyPtr npn, cpn; @@ -500,7 +500,7 @@ XvdiDestroyVideoNotifyList(pointer pn, XID id) } static int -XvdiDestroyEncoding(pointer value, XID id) +XvdiDestroyEncoding(void *value, XID id) { return Success; } @@ -510,7 +510,7 @@ XvdiSendVideoNotify(XvPortPtr pPort, DrawablePtr pDraw, int reason) { XvVideoNotifyPtr pn; - dixLookupResourceByType((pointer *) &pn, pDraw->id, XvRTVideoNotifyList, + dixLookupResourceByType((void **) &pn, pDraw->id, XvRTVideoNotifyList, serverClient, DixReadAccess); while (pn) { @@ -843,7 +843,7 @@ XvdiSelectVideoNotify(ClientPtr client, DrawablePtr pDraw, BOOL onoff) /* FIND VideoNotify LIST */ - rc = dixLookupResourceByType((pointer *) &pn, pDraw->id, + rc = dixLookupResourceByType((void **) &pn, pDraw->id, XvRTVideoNotifyList, client, DixWriteAccess); if (rc != Success && rc != BadValue) return rc; diff --git a/xorg-server/Xext/xvmc.c b/xorg-server/Xext/xvmc.c index 5f0123b32..64eda922b 100644 --- a/xorg-server/Xext/xvmc.c +++ b/xorg-server/Xext/xvmc.c @@ -61,7 +61,7 @@ typedef struct { (XvMCScreenPtr)(dixLookupPrivate(&(pScreen)->devPrivates, XvMCScreenKey)) static int -XvMCDestroyContextRes(pointer data, XID id) +XvMCDestroyContextRes(void *data, XID id) { XvMCContextPtr pContext = (XvMCContextPtr) data; @@ -78,7 +78,7 @@ XvMCDestroyContextRes(pointer data, XID id) } static int -XvMCDestroySurfaceRes(pointer data, XID id) +XvMCDestroySurfaceRes(void *data, XID id) { XvMCSurfacePtr pSurface = (XvMCSurfacePtr) data; XvMCContextPtr pContext = pSurface->context; @@ -87,13 +87,13 @@ XvMCDestroySurfaceRes(pointer data, XID id) (*pScreenPriv->adaptors[pContext->adapt_num].DestroySurface) (pSurface); free(pSurface); - XvMCDestroyContextRes((pointer) pContext, pContext->context_id); + XvMCDestroyContextRes((void *) pContext, pContext->context_id); return Success; } static int -XvMCDestroySubpictureRes(pointer data, XID id) +XvMCDestroySubpictureRes(void *data, XID id) { XvMCSubpicturePtr pSubpict = (XvMCSubpicturePtr) data; XvMCContextPtr pContext = pSubpict->context; @@ -102,7 +102,7 @@ XvMCDestroySubpictureRes(pointer data, XID id) (*pScreenPriv->adaptors[pContext->adapt_num].DestroySubpicture) (pSubpict); free(pSubpict); - XvMCDestroyContextRes((pointer) pContext, pContext->context_id); + XvMCDestroyContextRes((void *) pContext, pContext->context_id); return Success; } @@ -276,7 +276,7 @@ ProcXvMCCreateContext(ClientPtr client) static int ProcXvMCDestroyContext(ClientPtr client) { - pointer val; + void *val; int rc; REQUEST(xvmcDestroyContextReq); @@ -306,7 +306,7 @@ ProcXvMCCreateSurface(ClientPtr client) REQUEST(xvmcCreateSurfaceReq); REQUEST_SIZE_MATCH(xvmcCreateSurfaceReq); - result = dixLookupResourceByType((pointer *) &pContext, stuff->context_id, + result = dixLookupResourceByType((void **) &pContext, stuff->context_id, XvMCRTContext, client, DixUseAccess); if (result != Success) return result; @@ -350,7 +350,7 @@ ProcXvMCCreateSurface(ClientPtr client) static int ProcXvMCDestroySurface(ClientPtr client) { - pointer val; + void *val; int rc; REQUEST(xvmcDestroySurfaceReq); @@ -382,7 +382,7 @@ ProcXvMCCreateSubpicture(ClientPtr client) REQUEST(xvmcCreateSubpictureReq); REQUEST_SIZE_MATCH(xvmcCreateSubpictureReq); - result = dixLookupResourceByType((pointer *) &pContext, stuff->context_id, + result = dixLookupResourceByType((void **) &pContext, stuff->context_id, XvMCRTContext, client, DixUseAccess); if (result != Success) return result; @@ -474,7 +474,7 @@ ProcXvMCCreateSubpicture(ClientPtr client) static int ProcXvMCDestroySubpicture(ClientPtr client) { - pointer val; + void *val; int rc; REQUEST(xvmcDestroySubpictureReq); @@ -800,8 +800,8 @@ XvMCFindXvImage(XvPortPtr pPort, CARD32 id) } int -xf86XvMCRegisterDRInfo(ScreenPtr pScreen, char *name, - char *busID, int major, int minor, int patchLevel) +xf86XvMCRegisterDRInfo(ScreenPtr pScreen, const char *name, + const char *busID, int major, int minor, int patchLevel) { XvMCScreenPtr pScreenPriv = XVMC_GET_PRIVATE(pScreen); diff --git a/xorg-server/Xext/xvmcext.h b/xorg-server/Xext/xvmcext.h index 2201d7b5b..e8a6dae47 100644 --- a/xorg-server/Xext/xvmcext.h +++ b/xorg-server/Xext/xvmcext.h @@ -31,15 +31,15 @@ typedef struct { unsigned short height; CARD32 flags; int refcnt; - pointer port_priv; - pointer driver_priv; + void *port_priv; + void *driver_priv; } XvMCContextRec, *XvMCContextPtr; typedef struct { XID surface_id; int surface_type_id; XvMCContextPtr context; - pointer driver_priv; + void *driver_priv; } XvMCSurfaceRec, *XvMCSurfacePtr; typedef struct { @@ -51,7 +51,7 @@ typedef struct { int entry_bytes; char component_order[4]; XvMCContextPtr context; - pointer driver_priv; + void *driver_priv; } XvMCSubpictureRec, *XvMCSubpicturePtr; typedef int (*XvMCCreateContextProcPtr) (XvPortPtr port, @@ -91,8 +91,8 @@ extern _X_EXPORT int XvMCScreenInit(ScreenPtr pScreen, extern _X_EXPORT XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id); -extern _X_EXPORT int xf86XvMCRegisterDRInfo(ScreenPtr pScreen, char *name, - char *busID, int major, int minor, +extern _X_EXPORT int xf86XvMCRegisterDRInfo(ScreenPtr pScreen, const char *name, + const char *busID, int major, int minor, int patchLevel); #endif /* _XVMC_H */ |