diff options
| author | dwmalone <dwmalone@FreeBSD.org> | 2000-10-29 16:14:28 +0000 |
|---|---|---|
| committer | dwmalone <dwmalone@FreeBSD.org> | 2000-10-29 16:14:28 +0000 |
| commit | e401b83c31c135957d1a7be0c6e3d9a397af04f4 (patch) | |
| tree | 043a242b4f57610c1e64febb748e01644ecd10ef /sys/netncp/ncp_conn.c | |
| parent | 8cfaee4a94cc83819c9faa826778851c2824a532 (diff) | |
| download | FreeBSD-src-e401b83c31c135957d1a7be0c6e3d9a397af04f4.zip FreeBSD-src-e401b83c31c135957d1a7be0c6e3d9a397af04f4.tar.gz | |
Make malloc use M_ZERO in some more locations.
Don't check for a null pointer if malloc called with M_WAITOK.
Submitted by: josh@zipperup.org
Submitted by: Robert Drehmel <robd@gmx.net>
Approved by: bp
Diffstat (limited to 'sys/netncp/ncp_conn.c')
| -rw-r--r-- | sys/netncp/ncp_conn.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/netncp/ncp_conn.c b/sys/netncp/ncp_conn.c index df86f99..e62b147 100644 --- a/sys/netncp/ncp_conn.c +++ b/sys/netncp/ncp_conn.c @@ -189,10 +189,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++; @@ -413,9 +411,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; |
