diff options
author | des <des@FreeBSD.org> | 2008-10-23 15:53:51 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2008-10-23 15:53:51 +0000 |
commit | 66f807ed8b3634dc73d9f7526c484e43f094c0ee (patch) | |
tree | 21e792ce590e1bcf9b343890605a1b4c6a9016b3 /sys/rpc | |
parent | a779c60ce0a41cd14710a8a12cfa22955108b27a (diff) | |
download | FreeBSD-src-66f807ed8b3634dc73d9f7526c484e43f094c0ee.zip FreeBSD-src-66f807ed8b3634dc73d9f7526c484e43f094c0ee.tar.gz |
Retire the MALLOC and FREE macros. They are an abomination unto style(9).
MFC after: 3 months
Diffstat (limited to 'sys/rpc')
-rw-r--r-- | sys/rpc/rpcclnt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/rpc/rpcclnt.c b/sys/rpc/rpcclnt.c index 54cde66..1c90ff6 100644 --- a/sys/rpc/rpcclnt.c +++ b/sys/rpc/rpcclnt.c @@ -1029,7 +1029,7 @@ rpcclnt_reply(myrep, td) m_freem(nam); #else if (nam) - FREE(nam, M_SONAME); + free(nam, M_SONAME); #endif /* @@ -1154,7 +1154,7 @@ rpcclnt_request(rpc, mrest, procnum, td, cred, reply) #ifdef __OpenBSD__ task = pool_get(&rpctask_pool, PR_WAITOK); #else - MALLOC(task, struct rpctask *, sizeof(struct rpctask), M_RPCCLNT, (M_WAITOK | M_ZERO)); + task = malloc(sizeof(struct rpctask), M_RPCCLNT, (M_WAITOK | M_ZERO)); #endif task->r_rpcclnt = rpc; @@ -1172,7 +1172,7 @@ rpcclnt_request(rpc, mrest, procnum, td, cred, reply) #ifdef __OpenBSD__ pool_put(&rpctask_pool, task); #else - FREE(task, M_RPCCLNT); + free(task, M_RPCCLNT); #endif error = EPROTONOSUPPORT; goto rpcmout; @@ -1294,7 +1294,7 @@ rpcclnt_request(rpc, mrest, procnum, td, cred, reply) #ifdef __OpenBSD__ pool_put(&rpctask_pool, task); #else - FREE(task, M_RPCCLNT); + free(task, M_RPCCLNT); #endif if (error) @@ -2025,7 +2025,7 @@ rpcclnt_softterm(struct rpctask * task) void rpcclnt_create(struct rpcclnt ** rpc) { - MALLOC(*rpc, struct rpcclnt *, sizeof(struct rpcclnt), M_RPCCLNT, M_WAITOK | M_ZERO); + *rpc = malloc(sizeof(struct rpcclnt), M_RPCCLNT, M_WAITOK | M_ZERO); } /* called by rpcclnt_put() */ @@ -2033,7 +2033,7 @@ void rpcclnt_destroy(struct rpcclnt * rpc) { if (rpc != NULL) { - FREE(rpc, M_RPCCLNT); + free(rpc, M_RPCCLNT); } else { RPCDEBUG("attempting to free a NULL rpcclnt (not dereferenced)"); } |