Hello, switchd can just use memset instead of mixing memset with bzero. But does the util.c change need to be sync'ed with other tools?
- Michael Index: ofp10.c =================================================================== RCS file: /cvs/src/usr.sbin/switchd/ofp10.c,v retrieving revision 1.19 diff -u -p -u -r1.19 ofp10.c --- ofp10.c 2 Dec 2016 14:39:46 -0000 1.19 +++ ofp10.c 4 Apr 2018 04:00:19 -0000 @@ -342,7 +342,7 @@ ofp10_packet_match(struct packet *pkt, s { struct ether_header *eh = pkt->pkt_eh; - bzero(m, sizeof(*m)); + memset(m, 0, sizeof(*m)); m->m_wildcards = htonl(~flags); if ((flags & (OFP10_WILDCARD_DL_SRC|OFP10_WILDCARD_DL_DST)) && @@ -377,7 +377,7 @@ ofp10_packet_in(struct switchd *sc, stru if ((pin = ibuf_getdata(ibuf, sizeof(*pin))) == NULL) return (-1); - bzero(&pkt, sizeof(pkt)); + memset(&pkt, 0, sizeof(pkt)); len = ntohs(pin->pin_total_len); srcport = ntohs(pin->pin_port); Index: ofp13.c =================================================================== RCS file: /cvs/src/usr.sbin/switchd/ofp13.c,v retrieving revision 1.43 diff -u -p -u -r1.43 ofp13.c --- ofp13.c 17 Jan 2017 09:21:50 -0000 1.43 +++ ofp13.c 4 Apr 2018 04:00:20 -0000 @@ -1029,7 +1029,7 @@ ofp13_packet_in(struct switchd *sc, stru if (pin->pin_reason != OFP_PKTIN_REASON_NO_MATCH) return (-1); - bzero(&pkt, sizeof(pkt)); + memset(&pkt, 0, sizeof(pkt)); len = ntohs(pin->pin_total_len); /* very basic way of getting the source port */ Index: switchd.c =================================================================== RCS file: /cvs/src/usr.sbin/switchd/switchd.c,v retrieving revision 1.15 diff -u -p -u -r1.15 switchd.c --- switchd.c 9 Jan 2017 14:49:22 -0000 1.15 +++ switchd.c 4 Apr 2018 04:00:20 -0000 @@ -242,7 +242,7 @@ switchd_socket(struct sockaddr *sock, in /* * Socket options */ - bzero(&lng, sizeof(lng)); + memset(&lng, 0, sizeof(lng)); if (setsockopt(s, SOL_SOCKET, SO_LINGER, &lng, sizeof(lng)) == -1) goto bad; if (reuseport) { Index: util.c =================================================================== RCS file: /cvs/src/usr.sbin/switchd/util.c,v retrieving revision 1.6 diff -u -p -u -r1.6 util.c --- util.c 9 Jan 2017 14:49:22 -0000 1.6 +++ util.c 4 Apr 2018 04:00:20 -0000 @@ -196,7 +196,7 @@ prefixlen2mask6(uint8_t prefixlen, uint3 if (prefixlen > 128) prefixlen = 128; - bzero(&s6, sizeof(s6)); + memset(&s6, 0, sizeof(s6)); for (i = 0; i < prefixlen / 8; i++) s6.s6_addr[i] = 0xff; i = prefixlen % 8; @@ -277,7 +277,7 @@ print_map(unsigned int type, struct cons if (idx >= SWITCHD_CYCLE_BUFFERS) idx = 0; - bzero(buf[idx], sizeof(buf[idx])); + memset(buf[idx], 0, sizeof(buf[idx])); for (i = 0; map[i].cm_name != NULL; i++) { if (map[i].cm_type == type) {