From 019ee226cbdf08f5d42298b8e8358660f839f77e Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Sat, 4 Sep 2010 15:29:03 +0100 Subject: [PATCH] RX: Make rxi_Alloc return (void *) rxi_Alloc returns a pointer to an anonymous data block. Make its return value (void *) rather than (char *), so that it can be called in the same way as malloc(), and not require casting. Change-Id: Ib3094ad0273c62a4430eb56d35e3df68a550d338 Reviewed-on: http://gerrit.openafs.org/2738 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/rx/rx.c | 16 +++++++--------- src/rx/rx_event.c | 4 ++-- src/rx/rx_globals.h | 8 ++++---- src/rx/rx_prototypes.h | 2 +- src/rxkad/rxkad_client.c | 4 ++-- src/rxkad/rxkad_common.c | 4 ++-- 6 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/rx/rx.c b/src/rx/rx.c index 8ab0239..dbf9f0a 100644 --- a/src/rx/rx.c +++ b/src/rx/rx.c @@ -1679,8 +1679,7 @@ rx_GetCall(int tno, struct rx_service *cur_service, osi_socket * socketp) MUTEX_EXIT(&freeSQEList_lock); } else { /* otherwise allocate a new one and return that */ MUTEX_EXIT(&freeSQEList_lock); - sq = (struct rx_serverQueueEntry *) - rxi_Alloc(sizeof(struct rx_serverQueueEntry)); + sq = rxi_Alloc(sizeof(struct rx_serverQueueEntry)); MUTEX_INIT(&sq->lock, "server Queue lock", MUTEX_DEFAULT, 0); CV_INIT(&sq->cv, "server Queue lock", CV_DEFAULT, 0); } @@ -1852,8 +1851,7 @@ rx_GetCall(int tno, struct rx_service *cur_service, osi_socket * socketp) MUTEX_EXIT(&freeSQEList_lock); } else { /* otherwise allocate a new one and return that */ MUTEX_EXIT(&freeSQEList_lock); - sq = (struct rx_serverQueueEntry *) - rxi_Alloc(sizeof(struct rx_serverQueueEntry)); + sq = rxi_Alloc(sizeof(struct rx_serverQueueEntry)); MUTEX_INIT(&sq->lock, "server Queue lock", MUTEX_DEFAULT, 0); CV_INIT(&sq->cv, "server Queue lock", CV_DEFAULT, 0); } @@ -2318,7 +2316,7 @@ rxi_NewCall(struct rx_connection *conn, int channel) rxi_ResetCall(call, 1); } else { - call = (struct rx_call *)rxi_Alloc(sizeof(struct rx_call)); + call = rxi_Alloc(sizeof(struct rx_call)); #ifdef RXDEBUG_PACKET call->allNextp = rx_allCallsp; rx_allCallsp = call; @@ -2431,7 +2429,7 @@ rxi_FreeCall(struct rx_call *call) } afs_int32 rxi_Alloccnt = 0, rxi_Allocsize = 0; -char * +void * rxi_Alloc(size_t size) { char *p; @@ -7887,7 +7885,7 @@ rxi_AddRpcStat(struct rx_queue *stats, afs_uint32 rxInterface, sizeof(rx_interface_stat_t) + totalFunc * sizeof(rx_function_entry_v1_t); - rpc_stat = (rx_interface_stat_p) rxi_Alloc(space); + rpc_stat = rxi_Alloc(space); if (rpc_stat == NULL) { rc = 1; goto fail; @@ -8151,7 +8149,7 @@ rx_RetrieveProcessRPCStats(afs_uint32 callerVersion, afs_uint32 * myVersion, if (space > (size_t) 0) { *allocSize = space; - ptr = *stats = (afs_uint32 *) rxi_Alloc(space); + ptr = *stats = rxi_Alloc(space); if (ptr != NULL) { rx_interface_stat_p rpc_stat, nrpc_stat; @@ -8250,7 +8248,7 @@ rx_RetrievePeerRPCStats(afs_uint32 callerVersion, afs_uint32 * myVersion, if (space > (size_t) 0) { *allocSize = space; - ptr = *stats = (afs_uint32 *) rxi_Alloc(space); + ptr = *stats = rxi_Alloc(space); if (ptr != NULL) { rx_interface_stat_p rpc_stat, nrpc_stat; diff --git a/src/rx/rx_event.c b/src/rx/rx_event.c index f381e11..f677392 100644 --- a/src/rx/rx_event.c +++ b/src/rx/rx_event.c @@ -176,7 +176,7 @@ rxepoch_Allocate(struct clock *when) * and add them to the free queue */ if (queue_IsEmpty(&rxepoch_free)) { #if defined(AFS_AIX32_ENV) && defined(KERNEL) - ep = (struct rxepoch *)rxi_Alloc(sizeof(struct rxepoch)); + ep = rxi_Alloc(sizeof(struct rxepoch)); queue_Append(&rxepoch_free, &ep[0]), rxepoch_nFree++; #else #if defined(KERNEL) && !defined(UKERNEL) && defined(AFS_FBSD80_ENV) @@ -273,7 +273,7 @@ _rxevent_Post(struct clock *when, struct clock *now, if (queue_IsEmpty(&rxevent_free)) { int i; #if defined(AFS_AIX32_ENV) && defined(KERNEL) - ev = (struct rxevent *)rxi_Alloc(sizeof(struct rxevent)); + ev = rxi_Alloc(sizeof(struct rxevent)); queue_Append(&rxevent_free, &ev[0]), rxevent_nFree++; #else diff --git a/src/rx/rx_globals.h b/src/rx/rx_globals.h index e5208d2..85a6246 100644 --- a/src/rx/rx_globals.h +++ b/src/rx/rx_globals.h @@ -546,17 +546,17 @@ EXT afs_kmutex_t rx_connHashTable_lock; #define rxi_KeepAliveOff(call) rxevent_Cancel((call)->keepAliveEvent, call, RX_CALL_REFCOUNT_ALIVE) #define rxi_NatKeepAliveOff(conn) rxevent_Cancel((conn)->natKeepAliveEvent, (struct rx_call*)0, 0) -#define rxi_AllocSecurityObject() (struct rx_securityClass *) rxi_Alloc(sizeof(struct rx_securityClass)) +#define rxi_AllocSecurityObject() rxi_Alloc(sizeof(struct rx_securityClass)) #define rxi_FreeSecurityObject(obj) rxi_Free(obj, sizeof(struct rx_securityClass)) -#define rxi_AllocService() (struct rx_service *) rxi_Alloc(sizeof(struct rx_service)) +#define rxi_AllocService() rxi_Alloc(sizeof(struct rx_service)) #define rxi_FreeService(obj) \ do { \ MUTEX_DESTROY(&(obj)->svc_data_lock); \ rxi_Free((obj), sizeof(struct rx_service)); \ } while (0) -#define rxi_AllocPeer() (struct rx_peer *) rxi_Alloc(sizeof(struct rx_peer)) +#define rxi_AllocPeer() rxi_Alloc(sizeof(struct rx_peer)) #define rxi_FreePeer(peer) rxi_Free(peer, sizeof(struct rx_peer)) -#define rxi_AllocConnection() (struct rx_connection *) rxi_Alloc(sizeof(struct rx_connection)) +#define rxi_AllocConnection() rxi_Alloc(sizeof(struct rx_connection)) #define rxi_FreeConnection(conn) (rxi_Free(conn, sizeof(struct rx_connection))) EXT afs_int32 rx_stats_active GLOBALSINIT(1); /* boolean - rx statistics gathering */ diff --git a/src/rx/rx_prototypes.h b/src/rx/rx_prototypes.h index 3a1dad2..7368a64 100644 --- a/src/rx/rx_prototypes.h +++ b/src/rx/rx_prototypes.h @@ -92,7 +92,7 @@ extern void rxi_FreeCall(struct rx_call *call, int haveCTLock); extern void rxi_FreeCall(struct rx_call *call); #endif /* RX_ENABLE_LOCKS */ -extern char *rxi_Alloc(size_t size); +extern void *rxi_Alloc(size_t size); extern void rxi_Free(void *addr, size_t size); extern void rxi_SetPeerMtu(struct rx_peer *peer, afs_uint32 host, afs_uint32 port, int mtu); diff --git a/src/rxkad/rxkad_client.c b/src/rxkad/rxkad_client.c index a5c410a..6643cda 100644 --- a/src/rxkad/rxkad_client.c +++ b/src/rxkad/rxkad_client.c @@ -177,13 +177,13 @@ rxkad_NewClientSecurityObject(rxkad_level level, int size, psize; size = sizeof(struct rx_securityClass); - tsc = (struct rx_securityClass *)rxi_Alloc(size); + tsc = rxi_Alloc(size); memset((void *)tsc, 0, size); tsc->refCount = 1; /* caller gets one for free */ tsc->ops = &rxkad_client_ops; psize = PDATA_SIZE(ticketLen); - tcp = (struct rxkad_cprivate *)rxi_Alloc(psize); + tcp = rxi_Alloc(psize); memset((void *)tcp, 0, psize); tsc->privateData = (char *)tcp; tcp->type |= rxkad_client; diff --git a/src/rxkad/rxkad_common.c b/src/rxkad/rxkad_common.c index 11c4d60..d1259f6 100644 --- a/src/rxkad/rxkad_common.c +++ b/src/rxkad/rxkad_common.c @@ -337,13 +337,13 @@ rxkad_NewConnection(struct rx_securityClass *aobj, if (rx_IsServerConn(aconn)) { int size = sizeof(struct rxkad_sconn); - aconn->securityData = (char *)rxi_Alloc(size); + aconn->securityData = rxi_Alloc(size); memset(aconn->securityData, 0, size); /* initialize it conveniently */ } else { /* client */ struct rxkad_cprivate *tcp; struct rxkad_cconn *tccp; int size = sizeof(struct rxkad_cconn); - tccp = (struct rxkad_cconn *)rxi_Alloc(size); + tccp = rxi_Alloc(size); aconn->securityData = (char *)tccp; memset(aconn->securityData, 0, size); /* initialize it conveniently */ tcp = (struct rxkad_cprivate *)aobj->privateData; -- 1.9.4