From 289b41b5471ba65220cdcd882d178a9fe5a8288d Mon Sep 17 00:00:00 2001 From: ngie Date: Wed, 8 Jun 2016 17:27:38 +0000 Subject: [PATCH] MFC r299810: Correct function names that failed in error messages It should be calloc/strdup, not malloc git-svn-id: svn://svn.freebsd.org/base/stable/10@301653 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c | 4 ++-- usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c index 383309881..add712d5e 100644 --- a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c +++ b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c @@ -269,12 +269,12 @@ enum_pair_insert(struct enum_pairs *headp, int32_t enum_val, char *enum_str) struct enum_pair *e_new; if ((e_new = calloc(1, sizeof(struct enum_pair))) == NULL) { - syslog(LOG_ERR, "malloc() failed: %s", strerror(errno)); + syslog(LOG_ERR, "calloc() failed: %s", strerror(errno)); return (-1); } if ((e_new->enum_str = strdup(enum_str)) == NULL) { - syslog(LOG_ERR, "malloc() failed: %s", strerror(errno)); + syslog(LOG_ERR, "strdup() failed: %s", strerror(errno)); free(e_new); return (-1); } diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c index 959de7122..cbbb0948e 100644 --- a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c +++ b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c @@ -252,12 +252,12 @@ add_filename(struct snmp_toolinfo *snmptoolctx, const char *filename, } if ((fstring = strdup(filename)) == NULL) { - warnx("malloc() failed - %s", strerror(errno)); + warnx("strdup() failed - %s", strerror(errno)); return (-1); } if ((entry = calloc(1, sizeof(struct fname))) == NULL) { - warnx("malloc() failed - %s", strerror(errno)); + warnx("calloc() failed - %s", strerror(errno)); free(fstring); return (-1); } -- 2.45.0