Author: ngie
Date: Mon Jan 9 01:08:43 2017
New Revision: 311721
URL: https://svnweb.freebsd.org/changeset/base/311721
Log:
MFC r311382:
Use calloc instead of malloc + memset(.., 0, ..)
Modified:
stable/10/contrib/bsnmp/snmpd/trans_lsock.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/contrib/bsnmp/snmpd/trans_lsock.c
==============================================================================
--- stable/10/contrib/bsnmp/snmpd/trans_lsock.c Mon Jan 9 01:07:16 2017
(r311720)
+++ stable/10/contrib/bsnmp/snmpd/trans_lsock.c Mon Jan 9 01:08:43 2017
(r311721)
@@ -143,16 +143,14 @@ lsock_open_port(u_char *name, size_t nam
return (SNMP_ERR_BADVALUE);
}
- if ((port = malloc(sizeof(*port))) == NULL)
+ if ((port = calloc(1, sizeof(*port))) == NULL)
return (SNMP_ERR_GENERR);
- memset(port, 0, sizeof(*port));
if (!is_stream) {
- if ((peer = malloc(sizeof(*peer))) == NULL) {
+ if ((peer = calloc(1, sizeof(*peer))) == NULL) {
free(port);
return (SNMP_ERR_GENERR);
}
- memset(peer, 0, sizeof(*peer));
}
if ((port->name = malloc(namelen + 1)) == NULL) {
free(port);
@@ -258,12 +256,11 @@ lsock_listen_input(int fd, void *udata)
struct lsock_port *p = udata;
struct lsock_peer *peer;
- if ((peer = malloc(sizeof(*peer))) == NULL) {
+ if ((peer = calloc(1, sizeof(*peer))) == NULL) {
syslog(LOG_WARNING, "%s: peer malloc failed", p->name);
(void)close(accept(fd, NULL, NULL));
return;
}
- memset(peer, 0, sizeof(*peer));
peer->port = p;
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
