summaryrefslogtreecommitdiff
path: root/sys/netncp
diff options
context:
space:
mode:
authorBoris Popov <bp@FreeBSD.org>2001-02-22 08:47:28 +0000
committerBoris Popov <bp@FreeBSD.org>2001-02-22 08:47:28 +0000
commit0aa87da3fda891af7f7f4d7c6d52d0da86977c70 (patch)
tree845dc90c2b2d4568981318acabeb86a2ffb04e4b /sys/netncp
parent043df5f441b3a77c30c1c05d02180bcf1d426493 (diff)
Notes
Diffstat (limited to 'sys/netncp')
-rw-r--r--sys/netncp/ncp_conn.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/netncp/ncp_conn.c b/sys/netncp/ncp_conn.c
index 3cfc4491909b..d1b1339e272f 100644
--- a/sys/netncp/ncp_conn.c
+++ b/sys/netncp/ncp_conn.c
@@ -182,10 +182,8 @@ ncp_conn_alloc(struct proc *p, struct ucred *cred, struct ncp_conn **conn)
struct ncp_conn *ncp;
MALLOC(ncp, struct ncp_conn *, sizeof(struct ncp_conn),
- M_NCPDATA, M_WAITOK);
- if (ncp == NULL) return ENOMEM;
+ M_NCPDATA, M_WAITOK | M_ZERO);
error = 0;
- bzero(ncp,sizeof(*ncp));
lockinit(&ncp->nc_lock, PZERO, "ncplck", 0, 0);
ncp_conn_cnt++;
ncp->nc_id = ncp_next_ref++;
@@ -405,9 +403,8 @@ ncp_conn_gethandle(struct ncp_conn *conn, struct proc *p, struct ncp_handle **ha
lockmgr(&lhlock, LK_RELEASE, 0, p);
return 0;
}
- MALLOC(refp,struct ncp_handle *,sizeof(struct ncp_handle),M_NCPDATA,M_WAITOK);
- if (refp == NULL) return ENOMEM;
- bzero(refp,sizeof(*refp));
+ MALLOC(refp,struct ncp_handle *,sizeof(struct ncp_handle),M_NCPDATA,
+ M_WAITOK | M_ZERO);
SLIST_INSERT_HEAD(&lhlist,refp,nh_next);
refp->nh_ref++;
refp->nh_proc = p;