Date: Sat, 14 May 2016 20:25:14 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r299759 - head/usr.sbin/bsnmpd/tools/libbsnmptools Message-ID: <201605142025.u4EKPEbu027673@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sat May 14 20:25:14 2016 New Revision: 299759 URL: https://svnweb.freebsd.org/changeset/base/299759 Log: Use calloc instead of memset(.., 0, ..) + malloc MFC after: 1 week Sponsored by: EMC / Isilon Storage Division Modified: head/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c Modified: head/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c ============================================================================== --- head/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c Sat May 14 20:11:48 2016 (r299758) +++ head/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c Sat May 14 20:25:14 2016 (r299759) @@ -256,14 +256,12 @@ add_filename(struct snmp_toolinfo *snmpt return (-1); } - if ((entry = malloc(sizeof(struct fname))) == NULL) { + if ((entry = calloc(1, sizeof(struct fname))) == NULL) { warnx("malloc() failed - %s", strerror(errno)); free(fstring); return (-1); } - memset(entry, 0, sizeof(struct fname)); - if (cut != NULL) asn_append_oid(&(entry->cut), cut); strlcpy(fstring, filename, strlen(filename) + 1); @@ -1366,12 +1364,11 @@ snmp_object_add(struct snmp_toolinfo *sn return (-1); } - if ((obj = malloc(sizeof(struct snmp_object))) == NULL) { + if ((obj = calloc(1, sizeof(struct snmp_object))) == NULL) { syslog(LOG_ERR, "malloc() failed: %s", strerror(errno)); return (-1); } - memset(obj, 0, sizeof(struct snmp_object)); if (func(snmptoolctx, obj, string) < 0) { warnx("Invalid OID - %s", string); free(obj);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605142025.u4EKPEbu027673>