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/security | |
| 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/security')
| -rw-r--r-- | sys/security/mac_bsdextended/mac_bsdextended.c | 5 | ||||
| -rw-r--r-- | sys/security/mac_lomac/mac_lomac.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sys/security/mac_bsdextended/mac_bsdextended.c b/sys/security/mac_bsdextended/mac_bsdextended.c index 93befae..e9d7901 100644 --- a/sys/security/mac_bsdextended/mac_bsdextended.c +++ b/sys/security/mac_bsdextended/mac_bsdextended.c @@ -152,8 +152,7 @@ sysctl_rule(SYSCTL_HANDLER_ARGS) error = SYSCTL_IN(req, &temprule, sizeof(temprule)); if (error) return (error); - MALLOC(ruleptr, struct mac_bsdextended_rule *, - sizeof(*ruleptr), M_MACBSDEXTENDED, M_WAITOK | M_ZERO); + ruleptr = malloc( sizeof(*ruleptr), M_MACBSDEXTENDED, M_WAITOK | M_ZERO); } mtx_lock(&ugidfw_mtx); @@ -194,7 +193,7 @@ sysctl_rule(SYSCTL_HANDLER_ARGS) out: mtx_unlock(&ugidfw_mtx); if (ruleptr != NULL) - FREE(ruleptr, M_MACBSDEXTENDED); + free(ruleptr, M_MACBSDEXTENDED); if (req->oldptr && error == 0) error = SYSCTL_OUT(req, &temprule, sizeof(temprule)); return (error); diff --git a/sys/security/mac_lomac/mac_lomac.c b/sys/security/mac_lomac/mac_lomac.c index 2781366..1e7bc99 100644 --- a/sys/security/mac_lomac/mac_lomac.c +++ b/sys/security/mac_lomac/mac_lomac.c @@ -1866,7 +1866,7 @@ lomac_proc_destroy_label(struct label *label) { mtx_destroy(&PSLOT(label)->mtx); - FREE(PSLOT(label), M_LOMAC); + free(PSLOT(label), M_LOMAC); PSLOT_SET(label, NULL); } |
