d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fold two malloc + memset(.., 0, ..) calls into equivalent calloc calls

Browse Source 
MFC after: 3 weeks
Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
Enji Cooper 2016-05-14 04:00:17 +00:00
parent 29517fca53
commit 66987347e9
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c
View File

@ -635,12 +635,11 @@ snmp_import_table(struct snmp_toolinfo *snmptoolctx, struct snmp_oid2str *obj)
enum tok tok;
struct snmp_index_entry *entry;
if ((entry = malloc(sizeof(struct snmp_index_entry))) == NULL) {
if ((entry = calloc(1, sizeof(struct snmp_index_entry))) == NULL) {
syslog(LOG_ERR, "malloc() failed: %s", strerror(errno));
return (-1);
}
memset(entry, 0, sizeof(struct snmp_index_entry));
STAILQ_INIT(&(entry->index_list));
for (i = 0, tok = gettoken(snmptoolctx); i < SNMP_INDEXES_MAX; i++) {
@ -764,7 +763,7 @@ snmp_import_object(struct snmp_toolinfo *snmptoolctx)
if (snmp_import_head(snmptoolctx) < 0)
return (-1);
if ((oid2str = malloc(sizeof(struct snmp_oid2str))) == NULL) {
if ((oid2str = calloc(1, sizeof(struct snmp_oid2str))) == NULL) {
syslog(LOG_ERR, "malloc() failed: %s", strerror(errno));
return (-1);
}
@ -775,7 +774,6 @@ snmp_import_object(struct snmp_toolinfo *snmptoolctx)
return (-1);
}
memset(oid2str, 0, sizeof(struct snmp_oid2str));
strlcpy(string, nexttok, strlen(nexttok) + 1);
oid2str->string = string;
oid2str->strlen = strlen(nexttok);