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) ...@@ -150,7 +150,7 @@ SProcGEDispatch(ClientPtr client)
* used in the furture for versioning support. * used in the furture for versioning support.
*/ */
static void static void
GEClientCallback(CallbackListPtr *list, pointer closure, pointer data) GEClientCallback(CallbackListPtr *list, void *closure, void *data)
{ {
NewClientInfoRec *clientinfo = (NewClientInfoRec *) data; NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
ClientPtr pClient = clientinfo->client; ClientPtr pClient = clientinfo->client;
......
...@@ -23,7 +23,7 @@ struct HashTableRec { ...@@ -23,7 +23,7 @@ struct HashTableRec {
HashFunc hash; HashFunc hash;
HashCompareFunc compare; HashCompareFunc compare;
pointer cdata; void *cdata;
}; };
typedef struct { typedef struct {
...@@ -37,7 +37,7 @@ ht_create(int keySize, ...@@ -37,7 +37,7 @@ ht_create(int keySize,
int dataSize, int dataSize,
HashFunc hash, HashFunc hash,
HashCompareFunc compare, HashCompareFunc compare,
pointer cdata) void *cdata)
{ {
int c; int c;
int numBuckets; int numBuckets;
...@@ -117,7 +117,7 @@ double_size(HashTable ht) ...@@ -117,7 +117,7 @@ double_size(HashTable ht)
} }
} }
pointer void *
ht_add(HashTable ht, const void *key) ht_add(HashTable ht, const void *key)
{ {
unsigned index = ht->hash(ht->cdata, key, ht->bucketBits); unsigned index = ht->hash(ht->cdata, key, ht->bucketBits);
...@@ -182,7 +182,7 @@ ht_remove(HashTable ht, const void *key) ...@@ -182,7 +182,7 @@ ht_remove(HashTable ht, const void *key)
} }
} }
pointer void *
ht_find(HashTable ht, const void *key) ht_find(HashTable ht, const void *key)
{ {
unsigned index = ht->hash(ht->cdata, key, ht->bucketBits); unsigned index = ht->hash(ht->cdata, key, ht->bucketBits);
......
...@@ -55,7 +55,7 @@ extern _X_EXPORT HashTable ht_create(int keySize, ...@@ -55,7 +55,7 @@ extern _X_EXPORT HashTable ht_create(int keySize,
int dataSize, int dataSize,
HashFunc hash, HashFunc hash,
HashCompareFunc compare, HashCompareFunc compare,
pointer cdata); void *cdata);
/** @brief HtDestruct deinitializes the structure. It does not free the /** @brief HtDestruct deinitializes the structure. It does not free the
memory allocated to HashTableRec memory allocated to HashTableRec
*/ */
...@@ -75,7 +75,7 @@ extern _X_EXPORT void ht_destroy(HashTable ht); ...@@ -75,7 +75,7 @@ extern _X_EXPORT void ht_destroy(HashTable ht);
to avoid returning NULL. Obviously the data pointed cannot be to avoid returning NULL. Obviously the data pointed cannot be
modified, as implied by dataSize being 0. modified, as implied by dataSize being 0.
*/ */
extern _X_EXPORT pointer ht_add(HashTable ht, const void *key); extern _X_EXPORT void *ht_add(HashTable ht, const void *key);
/** @brief Removes a key from the hash table along with its /** @brief Removes a key from the hash table along with its
associated data, which will be free'd. associated data, which will be free'd.
...@@ -93,7 +93,7 @@ extern _X_EXPORT void ht_remove(HashTable ht, const void *key); ...@@ -93,7 +93,7 @@ extern _X_EXPORT void ht_remove(HashTable ht, const void *key);
use HtMember instead to determine if a key has been use HtMember instead to determine if a key has been
inserted. inserted.
*/ */
extern _X_EXPORT pointer ht_find(HashTable ht, const void *key); extern _X_EXPORT void *ht_find(HashTable ht, const void *key);
/** @brief A generic hash function */ /** @brief A generic hash function */
extern _X_EXPORT unsigned ht_generic_hash(void *cdata, extern _X_EXPORT unsigned ht_generic_hash(void *cdata,
......
...@@ -130,7 +130,7 @@ static void XineramaValidateGC(GCPtr, unsigned long, DrawablePtr); ...@@ -130,7 +130,7 @@ static void XineramaValidateGC(GCPtr, unsigned long, DrawablePtr);
static void XineramaChangeGC(GCPtr, unsigned long); static void XineramaChangeGC(GCPtr, unsigned long);
static void XineramaCopyGC(GCPtr, unsigned long, GCPtr); static void XineramaCopyGC(GCPtr, unsigned long, GCPtr);
static void XineramaDestroyGC(GCPtr); static void XineramaDestroyGC(GCPtr);
static void XineramaChangeClip(GCPtr, int, pointer, int); static void XineramaChangeClip(GCPtr, int, void *, int);
static void XineramaDestroyClip(GCPtr); static void XineramaDestroyClip(GCPtr);
static void XineramaCopyClip(GCPtr, GCPtr); static void XineramaCopyClip(GCPtr, GCPtr);
...@@ -160,7 +160,7 @@ XineramaCloseScreen(ScreenPtr pScreen) ...@@ -160,7 +160,7 @@ XineramaCloseScreen(ScreenPtr pScreen)
if (pScreen->myNum == 0) if (pScreen->myNum == 0)
RegionUninit(&PanoramiXScreenRegion); RegionUninit(&PanoramiXScreenRegion);
free((pointer) pScreenPriv); free(pScreenPriv);
return (*pScreen->CloseScreen) (pScreen); return (*pScreen->CloseScreen) (pScreen);
} }
...@@ -294,7 +294,7 @@ XineramaCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst) ...@@ -294,7 +294,7 @@ XineramaCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst)
} }
static void static void
XineramaChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects) XineramaChangeClip(GCPtr pGC, int type, void *pvalue, int nrects)
{ {
Xinerama_GC_FUNC_PROLOGUE(pGC); Xinerama_GC_FUNC_PROLOGUE(pGC);
(*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects); (*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects);
...@@ -318,7 +318,7 @@ XineramaDestroyClip(GCPtr pGC) ...@@ -318,7 +318,7 @@ XineramaDestroyClip(GCPtr pGC)
} }
int int
XineramaDeleteResource(pointer data, XID id) XineramaDeleteResource(void *data, XID id)
{ {
free(data); free(data);
return 1; return 1;
...@@ -330,7 +330,7 @@ typedef struct { ...@@ -330,7 +330,7 @@ typedef struct {
} PanoramiXSearchData; } PanoramiXSearchData;
static Bool static Bool
XineramaFindIDByScrnum(pointer resource, XID id, pointer privdata) XineramaFindIDByScrnum(void *resource, XID id, void *privdata)
{ {
PanoramiXRes *res = (PanoramiXRes *) resource; PanoramiXRes *res = (PanoramiXRes *) resource;
PanoramiXSearchData *data = (PanoramiXSearchData *) privdata; PanoramiXSearchData *data = (PanoramiXSearchData *) privdata;
...@@ -342,7 +342,7 @@ PanoramiXRes * ...@@ -342,7 +342,7 @@ PanoramiXRes *
PanoramiXFindIDByScrnum(RESTYPE type, XID id, int screen) PanoramiXFindIDByScrnum(RESTYPE type, XID id, int screen)
{ {
PanoramiXSearchData data; PanoramiXSearchData data;
pointer val; void *val;
if (!screen) { if (!screen) {
dixLookupResourceByType(&val, id, type, serverClient, DixReadAccess); dixLookupResourceByType(&val, id, type, serverClient, DixReadAccess);
...@@ -691,9 +691,9 @@ PanoramiXCreateConnectionBlock(void) ...@@ -691,9 +691,9 @@ PanoramiXCreateConnectionBlock(void)
root->mmHeight *= height_mult; root->mmHeight *= height_mult;
while (ConnectionCallbackList) { while (ConnectionCallbackList) {
pointer tmp; void *tmp;
tmp = (pointer) ConnectionCallbackList; tmp = (void *) ConnectionCallbackList;
(*ConnectionCallbackList->func) (); (*ConnectionCallbackList->func) ();
ConnectionCallbackList = ConnectionCallbackList->next; ConnectionCallbackList = ConnectionCallbackList->next;
free(tmp); free(tmp);
......
This diff is collapsed.
...@@ -19,7 +19,7 @@ extern _X_EXPORT Bool PanoramiXCreateConnectionBlock(void); ...@@ -19,7 +19,7 @@ extern _X_EXPORT Bool PanoramiXCreateConnectionBlock(void);
extern _X_EXPORT PanoramiXRes *PanoramiXFindIDByScrnum(RESTYPE, XID, int); extern _X_EXPORT PanoramiXRes *PanoramiXFindIDByScrnum(RESTYPE, XID, int);
extern _X_EXPORT Bool extern _X_EXPORT Bool
XineramaRegisterConnectionBlockCallback(void (*func) (void)); XineramaRegisterConnectionBlockCallback(void (*func) (void));
extern _X_EXPORT int XineramaDeleteResource(pointer, XID); extern _X_EXPORT int XineramaDeleteResource(void *, XID);
extern _X_EXPORT void XineramaReinitData(void); extern _X_EXPORT void XineramaReinitData(void);
......
...@@ -107,7 +107,7 @@ typedef struct _ScreenSaverSuspension { ...@@ -107,7 +107,7 @@ typedef struct _ScreenSaverSuspension {
int count; int count;
} ScreenSaverSuspensionRec; } ScreenSaverSuspensionRec;
static int ScreenSaverFreeSuspend(pointer /*value */ , static int ScreenSaverFreeSuspend(void */*value */ ,
XID /* id */ XID /* id */
); );
...@@ -131,7 +131,7 @@ typedef struct _ScreenSaverEvent { ...@@ -131,7 +131,7 @@ typedef struct _ScreenSaverEvent {
CARD32 mask; CARD32 mask;
} ScreenSaverEventRec; } ScreenSaverEventRec;
static int ScreenSaverFreeEvents(pointer /* value */ , static int ScreenSaverFreeEvents(void * /* value */ ,
XID /* id */ XID /* id */
); );
...@@ -168,7 +168,7 @@ typedef struct _ScreenSaverAttr { ...@@ -168,7 +168,7 @@ typedef struct _ScreenSaverAttr {
unsigned long *values; unsigned long *values;
} ScreenSaverAttrRec, *ScreenSaverAttrPtr; } ScreenSaverAttrRec, *ScreenSaverAttrPtr;
static int ScreenSaverFreeAttr(pointer /* value */ , static int ScreenSaverFreeAttr(void */* value */ ,
XID /* id */ XID /* id */
); );
...@@ -288,7 +288,7 @@ setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask) ...@@ -288,7 +288,7 @@ setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask)
pEv->client = client; pEv->client = client;
pEv->screen = pScreen; pEv->screen = pScreen;
pEv->resource = FakeClientID(client->index); pEv->resource = FakeClientID(client->index);
if (!AddResource(pEv->resource, SaverEventType, (pointer) pEv)) if (!AddResource(pEv->resource, SaverEventType, (void *) pEv))
return FALSE; return FALSE;
} }
pEv->mask = mask; pEv->mask = mask;
...@@ -319,7 +319,7 @@ FreeScreenAttr(ScreenSaverAttrPtr pAttr) ...@@ -319,7 +319,7 @@ FreeScreenAttr(ScreenSaverAttrPtr pAttr)
} }
static int static int
ScreenSaverFreeEvents(pointer value, XID id) ScreenSaverFreeEvents(void *value, XID id)
{ {
ScreenSaverEventPtr pOld = (ScreenSaverEventPtr) value; ScreenSaverEventPtr pOld = (ScreenSaverEventPtr) value;
ScreenPtr pScreen = pOld->screen; ScreenPtr pScreen = pOld->screen;
...@@ -341,7 +341,7 @@ ScreenSaverFreeEvents(pointer value, XID id) ...@@ -341,7 +341,7 @@ ScreenSaverFreeEvents(pointer value, XID id)
} }
static int static int
ScreenSaverFreeAttr(pointer value, XID id) ScreenSaverFreeAttr(void *value, XID id)
{ {
ScreenSaverAttrPtr pOldAttr = (ScreenSaverAttrPtr) value; ScreenSaverAttrPtr pOldAttr = (ScreenSaverAttrPtr) value;
ScreenPtr pScreen = pOldAttr->screen; ScreenPtr pScreen = pOldAttr->screen;
...@@ -363,7 +363,7 @@ ScreenSaverFreeAttr(pointer value, XID id) ...@@ -363,7 +363,7 @@ ScreenSaverFreeAttr(pointer value, XID id)
} }
static int static int
ScreenSaverFreeSuspend(pointer value, XID id) ScreenSaverFreeSuspend(void *value, XID id)
{ {
ScreenSaverSuspensionPtr data = (ScreenSaverSuspensionPtr) value; ScreenSaverSuspensionPtr data = (ScreenSaverSuspensionPtr) value;
ScreenSaverSuspensionPtr *prev, this; ScreenSaverSuspensionPtr *prev, this;
...@@ -460,7 +460,7 @@ UninstallSaverColormap(ScreenPtr pScreen) ...@@ -460,7 +460,7 @@ UninstallSaverColormap(ScreenPtr pScreen)
int rc; int rc;
if (pPriv && pPriv->installedMap != None) { if (pPriv && pPriv->installedMap != None) {
rc = dixLookupResourceByType((pointer *) &pCmap, pPriv->installedMap, rc = dixLookupResourceByType((void **) &pCmap, pPriv->installedMap,
RT_COLORMAP, serverClient, RT_COLORMAP, serverClient,
DixUninstallAccess); DixUninstallAccess);
if (rc == Success) if (rc == Success)
...@@ -571,7 +571,7 @@ CreateSaverWindow(ScreenPtr pScreen) ...@@ -571,7 +571,7 @@ CreateSaverWindow(ScreenPtr pScreen)
if (i < numInstalled) if (i < numInstalled)
return TRUE; return TRUE;
result = dixLookupResourceByType((pointer *) &pCmap, wantMap, RT_COLORMAP, result = dixLookupResourceByType((void **) &pCmap, wantMap, RT_COLORMAP,
serverClient, DixInstallAccess); serverClient, DixInstallAccess);
if (result != Success) if (result != Success)
return TRUE; return TRUE;
...@@ -923,7 +923,7 @@ ScreenSaverSetAttributes(ClientPtr client) ...@@ -923,7 +923,7 @@ ScreenSaverSetAttributes(ClientPtr client)
} }
else { else {
ret = ret =
dixLookupResourceByType((pointer *) &pPixmap, pixID, dixLookupResourceByType((void **) &pPixmap, pixID,
RT_PIXMAP, client, DixReadAccess); RT_PIXMAP, client, DixReadAccess);
if (ret == Success) { if (ret == Success) {
if ((pPixmap->drawable.depth != depth) || if ((pPixmap->drawable.depth != depth) ||
...@@ -955,7 +955,7 @@ ScreenSaverSetAttributes(ClientPtr client) ...@@ -955,7 +955,7 @@ ScreenSaverSetAttributes(ClientPtr client)
} }
else { else {
ret = ret =
dixLookupResourceByType((pointer *) &pPixmap, pixID, dixLookupResourceByType((void **) &pPixmap, pixID,
RT_PIXMAP, client, DixReadAccess); RT_PIXMAP, client, DixReadAccess);
if (ret == Success) { if (ret == Success) {
if ((pPixmap->drawable.depth != depth) || if ((pPixmap->drawable.depth != depth) ||
...@@ -1039,7 +1039,7 @@ ScreenSaverSetAttributes(ClientPtr client) ...@@ -1039,7 +1039,7 @@ ScreenSaverSetAttributes(ClientPtr client)
break; break;
case CWColormap: case CWColormap:
cmap = (Colormap) * pVlist; cmap = (Colormap) * pVlist;
ret = dixLookupResourceByType((pointer *) &pCmap, cmap, RT_COLORMAP, ret = dixLookupResourceByType((void **) &pCmap, cmap, RT_COLORMAP,
client, DixUseAccess); client, DixUseAccess);
if (ret != Success) { if (ret != Success) {
client->errorValue = cmap; client->errorValue = cmap;
...@@ -1058,7 +1058,7 @@ ScreenSaverSetAttributes(ClientPtr client) ...@@ -1058,7 +1058,7 @@ ScreenSaverSetAttributes(ClientPtr client)
*values++ = None; *values++ = None;
} }
else { else {
ret = dixLookupResourceByType((pointer *) &pCursor, cursorID, ret = dixLookupResourceByType((void **) &pCursor, cursorID,
RT_CURSOR, client, DixUseAccess); RT_CURSOR, client, DixUseAccess);
if (ret != Success) { if (ret != Success) {
client->errorValue = cursorID; client->errorValue = cursorID;
...@@ -1079,7 +1079,7 @@ ScreenSaverSetAttributes(ClientPtr client) ...@@ -1079,7 +1079,7 @@ ScreenSaverSetAttributes(ClientPtr client)
FreeScreenAttr(pPriv->attr); FreeScreenAttr(pPriv->attr);
pPriv->attr = pAttr; pPriv->attr = pAttr;
pAttr->resource = FakeClientID(client->index); pAttr->resource = FakeClientID(client->index);
if (!AddResource(pAttr->resource, AttrType, (pointer) pAttr)) if (!AddResource(pAttr->resource, AttrType, (void *) pAttr))
return BadAlloc; return BadAlloc;
return Success; return Success;
PatchUp: PatchUp:
...@@ -1131,7 +1131,7 @@ ProcScreenSaverSetAttributes(ClientPtr client) ...@@ -1131,7 +1131,7 @@ ProcScreenSaverSetAttributes(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xScreenSaverSetAttributesReq); REQUEST_AT_LEAST_SIZE(xScreenSaverSetAttributesReq);
status = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, status = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (status != Success) if (status != Success)
return (status == BadValue) ? BadDrawable : status; return (status == BadValue) ? BadDrawable : status;
...@@ -1146,7 +1146,7 @@ ProcScreenSaverSetAttributes(ClientPtr client) ...@@ -1146,7 +1146,7 @@ ProcScreenSaverSetAttributes(ClientPtr client)
pback_offset = Ones((Mask) stuff->mask & (CWBackPixmap - 1)); pback_offset = Ones((Mask) stuff->mask & (CWBackPixmap - 1));
tmp = *((CARD32 *) &stuff[1] + pback_offset); tmp = *((CARD32 *) &stuff[1] + pback_offset);
if ((tmp != None) && (tmp != ParentRelative)) { if ((tmp != None) && (tmp != ParentRelative)) {
status = dixLookupResourceByType((pointer *) &backPix, tmp, status = dixLookupResourceByType((void **) &backPix, tmp,
XRT_PIXMAP, client, XRT_PIXMAP, client,
DixReadAccess); DixReadAccess);
if (status != Success) if (status != Success)
...@@ -1158,7 +1158,7 @@ ProcScreenSaverSetAttributes(ClientPtr client) ...@@ -1158,7 +1158,7 @@ ProcScreenSaverSetAttributes(ClientPtr client)
pbord_offset = Ones((Mask) stuff->mask & (CWBorderPixmap - 1)); pbord_offset = Ones((Mask) stuff->mask & (CWBorderPixmap - 1));
tmp = *((CARD32 *) &stuff[1] + pbord_offset); tmp = *((CARD32 *) &stuff[1] + pbord_offset);
if (tmp != CopyFromParent) { if (tmp != CopyFromParent) {
status = dixLookupResourceByType((pointer *) &bordPix, tmp, status = dixLookupResourceByType((void **) &bordPix, tmp,
XRT_PIXMAP, client, XRT_PIXMAP, client,
DixReadAccess); DixReadAccess);
if (status != Success) if (status != Success)
...@@ -1170,7 +1170,7 @@ ProcScreenSaverSetAttributes(ClientPtr client) ...@@ -1170,7 +1170,7 @@ ProcScreenSaverSetAttributes(ClientPtr client)
cmap_offset = Ones((Mask) stuff->mask & (CWColormap - 1)); cmap_offset = Ones((Mask) stuff->mask & (CWColormap - 1));
tmp = *((CARD32 *) &stuff[1] + cmap_offset); tmp = *((CARD32 *) &stuff[1] + cmap_offset);
if ((tmp != CopyFromParent) && (tmp != None)) { if ((tmp != CopyFromParent) && (tmp != None)) {
status = dixLookupResourceByType((pointer *) &cmap, tmp, status = dixLookupResourceByType((void **) &cmap, tmp,
XRT_COLORMAP, client, XRT_COLORMAP, client,
DixReadAccess); DixReadAccess);
if (status != Success) if (status != Success)
...@@ -1211,7 +1211,7 @@ ProcScreenSaverUnsetAttributes(ClientPtr client) ...@@ -1211,7 +1211,7 @@ ProcScreenSaverUnsetAttributes(ClientPtr client)
PanoramiXRes *draw; PanoramiXRes *draw;
int rc, i; int rc, i;
rc = dixLookupResourceByClass((pointer *) &draw, stuff->drawable, rc = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (rc != Success) if (rc != Success)
return (rc == BadValue) ? BadDrawable : rc; return (rc == BadValue) ? BadDrawable : rc;
...@@ -1270,7 +1270,7 @@ ProcScreenSaverSuspend(ClientPtr client) ...@@ -1270,7 +1270,7 @@ ProcScreenSaverSuspend(ClientPtr client)
this->count = 1; this->count = 1;
this->clientResource = FakeClientID(client->index); this->clientResource = FakeClientID(client->index);
if (!AddResource(this->clientResource, SuspendType, (pointer) this)) { if (!AddResource(this->clientResource, SuspendType, (void *) this)) {
free(this); free(this);
return BadAlloc; return BadAlloc;
} }
......
...@@ -167,7 +167,7 @@ SecurityLookupRequestName(ClientPtr client) ...@@ -167,7 +167,7 @@ SecurityLookupRequestName(ClientPtr client)
*/ */
static int static int
SecurityDeleteAuthorization(pointer value, XID id) SecurityDeleteAuthorization(void *value, XID id)
{ {
SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr) value; SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr) value;
unsigned short name_len, data_len; unsigned short name_len, data_len;
...@@ -221,7 +221,7 @@ SecurityDeleteAuthorization(pointer value, XID id) ...@@ -221,7 +221,7 @@ SecurityDeleteAuthorization(pointer value, XID id)
/* resource delete function for RTEventClient */ /* resource delete function for RTEventClient */
static int static int
SecurityDeleteAuthorizationEventClient(pointer value, XID id) SecurityDeleteAuthorizationEventClient(void *value, XID id)
{ {
OtherClientsPtr pEventClient, prev = NULL; OtherClientsPtr pEventClient, prev = NULL;
SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr) value; SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr) value;
...@@ -294,7 +294,7 @@ SecurityComputeAuthorizationTimeout(SecurityAuthorizationPtr pAuth, ...@@ -294,7 +294,7 @@ SecurityComputeAuthorizationTimeout(SecurityAuthorizationPtr pAuth,
*/ */
static CARD32 static CARD32
SecurityAuthorizationExpired(OsTimerPtr timer, CARD32 time, pointer pval) SecurityAuthorizationExpired(OsTimerPtr timer, CARD32 time, void *pval)
{ {
SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr) pval; SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr) pval;
...@@ -382,7 +382,7 @@ SecurityEventSelectForAuthorization(SecurityAuthorizationPtr pAuth, ...@@ -382,7 +382,7 @@ SecurityEventSelectForAuthorization(SecurityAuthorizationPtr pAuth,
pEventClient->mask = mask; pEventClient->mask = mask;
pEventClient->resource = FakeClientID(client->index); pEventClient->resource = FakeClientID(client->index);
pEventClient->next = pAuth->eventClients; pEventClient->next = pAuth->eventClients;
if (!AddResource(pEventClient->resource, RTEventClient, (pointer) pAuth)) { if (!AddResource(pEventClient->resource, RTEventClient, (void *) pAuth)) {
free(pEventClient); free(pEventClient);
return BadAlloc; return BadAlloc;
} }
...@@ -454,7 +454,7 @@ ProcSecurityGenerateAuthorization(ClientPtr client) ...@@ -454,7 +454,7 @@ ProcSecurityGenerateAuthorization(ClientPtr client)
vgi.group = group; vgi.group = group;
vgi.valid = FALSE; vgi.valid = FALSE;
CallCallbacks(&SecurityValidateGroupCallback, (pointer) &vgi); CallCallbacks(&SecurityValidateGroupCallback, (void *) &vgi);
/* if nobody said they recognized it, it's an error */ /* if nobody said they recognized it, it's an error */
...@@ -575,7 +575,7 @@ ProcSecurityRevokeAuthorization(ClientPtr client) ...@@ -575,7 +575,7 @@ ProcSecurityRevokeAuthorization(ClientPtr client)
REQUEST_SIZE_MATCH(xSecurityRevokeAuthorizationReq); REQUEST_SIZE_MATCH(xSecurityRevokeAuthorizationReq);
rc = dixLookupResourceByType((pointer *) &pAuth, stuff->authId, rc = dixLookupResourceByType((void **) &pAuth, stuff->authId,
SecurityAuthorizationResType, client, SecurityAuthorizationResType, client,
DixDestroyAccess); DixDestroyAccess);
if (rc != Success) if (rc != Success)
...@@ -693,7 +693,7 @@ SwapSecurityAuthorizationRevokedEvent(xSecurityAuthorizationRevokedEvent * from, ...@@ -693,7 +693,7 @@ SwapSecurityAuthorizationRevokedEvent(xSecurityAuthorizationRevokedEvent * from,
*/ */
static void static void
SecurityDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata) SecurityDevice(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
XaceDeviceAccessRec *rec = calldata; XaceDeviceAccessRec *rec = calldata;
SecurityStateRec *subj, *obj; SecurityStateRec *subj, *obj;
...@@ -737,7 +737,7 @@ SecurityDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata) ...@@ -737,7 +737,7 @@ SecurityDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata)
*/ */
static void static void
SecurityResource(CallbackListPtr *pcbl, pointer unused, pointer calldata) SecurityResource(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
XaceResourceAccessRec *rec = calldata; XaceResourceAccessRec *rec = calldata;
SecurityStateRec *subj, *obj; SecurityStateRec *subj, *obj;
...@@ -785,7 +785,7 @@ SecurityResource(CallbackListPtr *pcbl, pointer unused, pointer calldata) ...@@ -785,7 +785,7 @@ SecurityResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
} }
static void static void
SecurityExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata) SecurityExtension(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {