aboutsummaryrefslogtreecommitdiff
path: root/sys/netsmb
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2008-10-23 15:53:51 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2008-10-23 15:53:51 +0000
commit1ede983cc905643549d8cae56a9d0e28fc68375f (patch)
tree21e792ce590e1bcf9b343890605a1b4c6a9016b3 /sys/netsmb
parent994f9863852fe65833509090659d9f5aef7194d3 (diff)
downloadsrc-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/netsmb')
-rw-r--r--sys/netsmb/smb_rq.c4
-rw-r--r--sys/netsmb/smb_trantcp.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/netsmb/smb_rq.c b/sys/netsmb/smb_rq.c
index 5d2557ce09b7..3d068b6c1574 100644
--- a/sys/netsmb/smb_rq.c
+++ b/sys/netsmb/smb_rq.c
@@ -70,7 +70,7 @@ smb_rq_alloc(struct smb_connobj *layer, u_char cmd, struct smb_cred *scred,
struct smb_rq *rqp;
int error;
- MALLOC(rqp, struct smb_rq *, sizeof(*rqp), M_SMBRQ, M_WAITOK);
+ rqp = malloc(sizeof(*rqp), M_SMBRQ, M_WAITOK);
if (rqp == NULL)
return ENOMEM;
error = smb_rq_init(rqp, layer, cmd, scred);
@@ -383,7 +383,7 @@ smb_t2_alloc(struct smb_connobj *layer, u_short setup, struct smb_cred *scred,
struct smb_t2rq *t2p;
int error;
- MALLOC(t2p, struct smb_t2rq *, sizeof(*t2p), M_SMBRQ, M_WAITOK);
+ t2p = malloc(sizeof(*t2p), M_SMBRQ, M_WAITOK);
if (t2p == NULL)
return ENOMEM;
error = smb_t2_init(t2p, layer, setup, scred);
diff --git a/sys/netsmb/smb_trantcp.c b/sys/netsmb/smb_trantcp.c
index 88fd55635eea..167b74be0191 100644
--- a/sys/netsmb/smb_trantcp.c
+++ b/sys/netsmb/smb_trantcp.c
@@ -438,7 +438,7 @@ smb_nbst_create(struct smb_vc *vcp, struct thread *td)
{
struct nbpcb *nbp;
- MALLOC(nbp, struct nbpcb *, sizeof *nbp, M_NBDATA, M_WAITOK);
+ nbp = malloc(sizeof *nbp, M_NBDATA, M_WAITOK);
bzero(nbp, sizeof *nbp);
nbp->nbp_timo.tv_sec = 15; /* XXX: sysctl ? */
nbp->nbp_state = NBST_CLOSED;