diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2008-10-23 15:53:51 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2008-10-23 15:53:51 +0000 |
| commit | 1ede983cc905643549d8cae56a9d0e28fc68375f (patch) | |
| tree | 21e792ce590e1bcf9b343890605a1b4c6a9016b3 /sys/kern/kern_prot.c | |
| parent | 994f9863852fe65833509090659d9f5aef7194d3 (diff) | |
| download | src-1ede983cc905643549d8cae56a9d0e28fc68375f.tar.gz src-1ede983cc905643549d8cae56a9d0e28fc68375f.zip | |
Retire the MALLOC and FREE macros. They are an abomination unto style(9).
MFC after: 3 months
Notes
Notes:
svn path=/head/; revision=184205
Diffstat (limited to 'sys/kern/kern_prot.c')
| -rw-r--r-- | sys/kern/kern_prot.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index bbd4fd5bf243..348acdf131a2 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -326,8 +326,8 @@ setsid(register struct thread *td, struct setsid_args *uap) error = 0; pgrp = NULL; - MALLOC(newpgrp, struct pgrp *, sizeof(struct pgrp), M_PGRP, M_WAITOK | M_ZERO); - MALLOC(newsess, struct session *, sizeof(struct session), M_SESSION, M_WAITOK | M_ZERO); + newpgrp = malloc(sizeof(struct pgrp), M_PGRP, M_WAITOK | M_ZERO); + newsess = malloc(sizeof(struct session), M_SESSION, M_WAITOK | M_ZERO); sx_xlock(&proctree_lock); @@ -345,9 +345,9 @@ setsid(register struct thread *td, struct setsid_args *uap) sx_xunlock(&proctree_lock); if (newpgrp != NULL) - FREE(newpgrp, M_PGRP); + free(newpgrp, M_PGRP); if (newsess != NULL) - FREE(newsess, M_SESSION); + free(newsess, M_SESSION); return (error); } @@ -386,7 +386,7 @@ setpgid(struct thread *td, register struct setpgid_args *uap) error = 0; - MALLOC(newpgrp, struct pgrp *, sizeof(struct pgrp), M_PGRP, M_WAITOK | M_ZERO); + newpgrp = malloc(sizeof(struct pgrp), M_PGRP, M_WAITOK | M_ZERO); sx_xlock(&proctree_lock); if (uap->pid != 0 && uap->pid != curp->p_pid) { @@ -450,7 +450,7 @@ done: KASSERT((error == 0) || (newpgrp != NULL), ("setpgid failed and newpgrp is NULL")); if (newpgrp != NULL) - FREE(newpgrp, M_PGRP); + free(newpgrp, M_PGRP); return (error); } @@ -1778,7 +1778,7 @@ crget(void) { register struct ucred *cr; - MALLOC(cr, struct ucred *, sizeof(*cr), M_CRED, M_WAITOK | M_ZERO); + cr = malloc(sizeof(*cr), M_CRED, M_WAITOK | M_ZERO); refcount_init(&cr->cr_ref, 1); #ifdef AUDIT audit_cred_init(cr); @@ -1830,7 +1830,7 @@ crfree(struct ucred *cr) #ifdef MAC mac_cred_destroy(cr); #endif - FREE(cr, M_CRED); + free(cr, M_CRED); } } |