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/kern/uipc_mqueue.c | |
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/kern/uipc_mqueue.c')
-rw-r--r-- | sys/kern/uipc_mqueue.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index aa362cb..123f652 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -1545,7 +1545,7 @@ mqueue_free(struct mqueue *mq) while ((msg = TAILQ_FIRST(&mq->mq_msgq)) != NULL) { TAILQ_REMOVE(&mq->mq_msgq, msg, msg_link); - FREE(msg, M_MQUEUEDATA); + free(msg, M_MQUEUEDATA); } mtx_destroy(&mq->mq_mutex); @@ -1566,11 +1566,11 @@ mqueue_loadmsg(const char *msg_ptr, size_t msg_size, int msg_prio) int error; len = sizeof(struct mqueue_msg) + msg_size; - MALLOC(msg, struct mqueue_msg *, len, M_MQUEUEDATA, M_WAITOK); + msg = malloc(len, M_MQUEUEDATA, M_WAITOK); error = copyin(msg_ptr, ((char *)msg) + sizeof(struct mqueue_msg), msg_size); if (error) { - FREE(msg, M_MQUEUEDATA); + free(msg, M_MQUEUEDATA); msg = NULL; } else { msg->msg_size = msg_size; @@ -1600,7 +1600,7 @@ mqueue_savemsg(struct mqueue_msg *msg, char *msg_ptr, int *msg_prio) static __inline void mqueue_freemsg(struct mqueue_msg *msg) { - FREE(msg, M_MQUEUEDATA); + free(msg, M_MQUEUEDATA); } /* |