Convert more malloc+bzero to malloc+M_ZERO.

Submitted by:	josh@zipperup.org
Submitted by:	Robert Drehmel <robd@gmx.net>

4 files changed, 5 insertions, 8 deletions

diff --git a/sys/netipx/ipx.c b/sys/netipx/ipx.c
index 7ba85ae..6dfc32f 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 9062d3b..042d276 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 61af5c3..0ae2462 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 be8eb97..eef2445 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);