svn commit: r299812 - user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools

[Garrett Cooper]

Author: ngie
Date: Sun May 15 00:28:22 2016
New Revision: 299812
URL: https://svnweb.freebsd.org/changeset/base/299812

Log:
  MFhead @ r299811

Modified:
  user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c
  user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c
  user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
Directory Properties:
  user/ngie/bsnmp_cleanup/   (props changed)

Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c	Sun May 15 00:25:36 2016	(r299811)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c	Sun May 15 00:28:22 2016	(r299812)
@@ -763,17 +763,16 @@ snmp_import_object(struct snmp_toolinfo 
 		return (-1);
 
 	if ((oid2str = calloc(1, sizeof(struct snmp_oid2str))) == NULL) {
-		syslog(LOG_ERR, "malloc() failed: %s", strerror(errno));
+		syslog(LOG_ERR, "calloc() failed: %s", strerror(errno));
 		return (-1);
 	}
 
-	if ((string = malloc(strlen(nexttok) + 1)) == NULL) {
-		syslog(LOG_ERR, "malloc() failed: %s", strerror(errno));
+	if ((string = strdup(nexttok)) == NULL) {
+		syslog(LOG_ERR, "strdup() failed: %s", strerror(errno));
 		free(oid2str);
 		return (-1);
 	}
 
-	strlcpy(string, nexttok, nitems(string));
 	oid2str->string = string;
 	oid2str->strlen = strlen(nexttok);
 

Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c	Sun May 15 00:25:36 2016	(r299811)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c	Sun May 15 00:28:22 2016	(r299812)
@@ -268,12 +268,12 @@ enum_pair_insert(struct enum_pairs *head
 	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);
 	}

Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c	Sun May 15 00:25:36 2016	(r299811)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c	Sun May 15 00:28:22 2016	(r299812)
@@ -252,12 +252,12 @@ add_filename(struct snmp_toolinfo *snmpt
 	}
 
 	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);
 	}