diff options
| author | David Malone <dwmalone@FreeBSD.org> | 2000-12-08 21:51:06 +0000 |
|---|---|---|
| committer | David Malone <dwmalone@FreeBSD.org> | 2000-12-08 21:51:06 +0000 |
| commit | 7cc0979fd64b721c92c3dd4a8688b56e15c9a5f9 (patch) | |
| tree | c383ffd6da8fbab2789828310191f8717f675124 /sys/netipx | |
| parent | b1f3daafde37fa36b819c0649c121d98175a6a2d (diff) | |
| download | src-7cc0979fd64b721c92c3dd4a8688b56e15c9a5f9.tar.gz src-7cc0979fd64b721c92c3dd4a8688b56e15c9a5f9.zip | |
Convert more malloc+bzero to malloc+M_ZERO.
Submitted by: josh@zipperup.org
Submitted by: Robert Drehmel <robd@gmx.net>
Notes
Notes:
svn path=/head/; revision=69781
Diffstat (limited to 'sys/netipx')
| -rw-r--r-- | sys/netipx/ipx.c | 4 | ||||
| -rw-r--r-- | sys/netipx/ipx_ip.c | 3 | ||||
| -rw-r--r-- | sys/netipx/ipx_pcb.c | 3 | ||||
| -rw-r--r-- | sys/netipx/spx_usrreq.c | 3 |
4 files changed, 5 insertions, 8 deletions
diff --git a/sys/netipx/ipx.c b/sys/netipx/ipx.c index 7ba85ae4303c..6dfc32fa937c 100644 --- a/sys/netipx/ipx.c +++ b/sys/netipx/ipx.c @@ -129,10 +129,10 @@ ipx_control(so, cmd, data, ifp, p) case SIOCSIFDSTADDR: if (ia == NULL) { oia = (struct ipx_ifaddr *) - malloc(sizeof(*ia), M_IFADDR, M_WAITOK); + malloc(sizeof(*ia), M_IFADDR, + M_WAITOK | M_ZERO); if (oia == NULL) return (ENOBUFS); - bzero((caddr_t)oia, sizeof(*oia)); if ((ia = ipx_ifaddr) != NULL) { for ( ; ia->ia_next != NULL; ia = ia->ia_next) ; diff --git a/sys/netipx/ipx_ip.c b/sys/netipx/ipx_ip.c index 9062d3b1e2c2..042d276b40da 100644 --- a/sys/netipx/ipx_ip.c +++ b/sys/netipx/ipx_ip.c @@ -101,10 +101,9 @@ ipxipattach() ifp->if_flags = IFF_POINTOPOINT; } - MALLOC((m), struct ifnet_en *, sizeof(*m), M_PCB, M_NOWAIT); + MALLOC((m), struct ifnet_en *, sizeof(*m), M_PCB, M_NOWAIT | M_ZERO); if (m == NULL) return (NULL); - bzero(m, sizeof(*m)); m->ifen_next = ipxip_list; ipxip_list = m; ifp = &m->ifen_ifnet; diff --git a/sys/netipx/ipx_pcb.c b/sys/netipx/ipx_pcb.c index 61af5c32ef7e..0ae2462a71a3 100644 --- a/sys/netipx/ipx_pcb.c +++ b/sys/netipx/ipx_pcb.c @@ -60,10 +60,9 @@ ipx_pcballoc(so, head, p) { register struct ipxpcb *ipxp; - MALLOC(ipxp, struct ipxpcb *, sizeof *ipxp, M_PCB, M_NOWAIT); + MALLOC(ipxp, struct ipxpcb *, sizeof *ipxp, M_PCB, M_NOWAIT | M_ZERO); if (ipxp == NULL) return (ENOBUFS); - bzero(ipxp, sizeof *ipxp); ipxp->ipxp_socket = so; if (ipxcksum) ipxp->ipxp_flags |= IPXP_CHECKSUM; diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c index be8eb976ac85..eef2445eed2e 100644 --- a/sys/netipx/spx_usrreq.c +++ b/sys/netipx/spx_usrreq.c @@ -1330,13 +1330,12 @@ spx_attach(so, proto, p) } ipxp = sotoipxpcb(so); - MALLOC(cb, struct spxpcb *, sizeof *cb, M_PCB, M_NOWAIT); + MALLOC(cb, struct spxpcb *, sizeof *cb, M_PCB, M_NOWAIT | M_ZERO); if (cb == NULL) { error = ENOBUFS; goto spx_attach_end; } - bzero(cb, sizeof *cb); sb = &so->so_snd; mm = m_getclr(M_DONTWAIT, MT_HEADER); |