Commit 60014a4a authored by Keith Packard's avatar Keith Packard

Replace 'pointer' type with 'void *'

This lets us stop using the 'pointer' typedef in Xdefs.h as 'pointer'
is used throughout the X server for other things, and having duplicate
names generates compiler warnings.
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
parent 93fa64e1
......@@ -150,7 +150,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;
......
......@@ -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,7 +117,7 @@ double_size(HashTable ht)
}
}
pointer
void *
ht_add(HashTable ht, const void *key)
{
unsigned index = ht->hash(ht->cdata, key, ht->bucketBits);
......@@ -182,7 +182,7 @@ ht_remove(HashTable ht, const void *key)
}
}
pointer
void *
ht_find(HashTable ht, const void *key)
{
unsigned index = ht->hash(ht->cdata, key, ht->bucketBits);
......
......@@ -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,7 +75,7 @@ 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, const void *key);
extern _X_EXPORT void *ht_add(HashTable ht, const void *key);
/** @brief Removes a key from the hash table along with its
associated data, which will be free'd.
......@@ -93,7 +93,7 @@ extern _X_EXPORT void ht_remove(HashTable ht, const void *key);
use HtMember instead to determine if a key has been
inserted.
*/
extern _X_EXPORT pointer ht_find(HashTable ht, const void *key);
extern _X_EXPORT void *ht_find(HashTable ht, const void *key);
/** @brief A generic hash function */
extern _X_EXPORT unsigned ht_generic_hash(void *cdata,
......
......@@ -130,7 +130,7 @@ 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);
......@@ -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);
......
This diff is collapsed.
......@@ -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);
......
......@@ -107,7 +107,7 @@ typedef struct _ScreenSaverSuspension {
int count;
} ScreenSaverSuspensionRec;
static int ScreenSaverFreeSuspend(pointer /*value */ ,
static int ScreenSaverFreeSuspend(void */*value */ ,
XID /* id */
);
......@@ -131,7 +131,7 @@ typedef struct _ScreenSaverEvent {
CARD32 mask;
} ScreenSaverEventRec;
static int ScreenSaverFreeEvents(pointer /* value */ ,
static int ScreenSaverFreeEvents(void * /* value */ ,
XID /* id */
);
......@@ -168,7 +168,7 @@ typedef struct _ScreenSaverAttr {
unsigned long *values;
} ScreenSaverAttrRec, *ScreenSaverAttrPtr;
static int ScreenSaverFreeAttr(pointer /* value */ ,
static int ScreenSaverFreeAttr(void */* value */ ,
XID /* id */
);
......@@ -288,7 +288,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;
......@@ -319,7 +319,7 @@ FreeScreenAttr(ScreenSaverAttrPtr pAttr)
}
static int
ScreenSaverFreeEvents(pointer value, XID id)
ScreenSaverFreeEvents(void *value, XID id)
{
ScreenSaverEventPtr pOld = (ScreenSaverEventPtr) value;
ScreenPtr pScreen = pOld->screen;
......@@ -341,7 +341,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;
......@@ -363,7 +363,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;
......@@ -460,7 +460,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)
......@@ -571,7 +571,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;
......@@ -923,7 +923,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) ||
......@@ -955,7 +955,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) ||
......@@ -1039,7 +1039,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;
......@@ -1058,7 +1058,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;
......@@ -1079,7 +1079,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:
......@@ -1131,7 +1131,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;
......@@ -1146,7 +1146,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)
......@@ -1158,7 +1158,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)
......@@ -1170,7 +1170,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)
......@@ -1211,7 +1211,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;
......@@ -1270,7 +1270,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;
}
......
......@@ -167,7 +167,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;
......@@ -221,7 +221,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;
......@@ -294,7 +294,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 */
......@@ -575,7 +575,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)
......@@ -693,7 +693,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;
......@@ -737,7 +737,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;
......@@ -785,7 +785,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;
......@@ -808,7 +808,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;
......@@ -827,7 +827,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;
......@@ -846,7 +846,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;
......@@ -868,7 +868,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;
......@@ -900,7 +900,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;
......@@ -941,7 +941,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;
......@@ -960,7 +960,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) {
......@@ -976,7 +976,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) {
......
......@@ -50,11 +50,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 */
......@@ -306,7 +306,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;
......@@ -361,7 +361,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;
......@@ -404,13 +404,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;
......@@ -532,12 +532,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;
......@@ -603,7 +603,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));