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

[Garrett Cooper]

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

Log:
  Diff reduce with ^/head

Modified:
  user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c
  user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c

Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c	Sun May 15 00:28:22 2016	(r299812)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c	Sun May 15 00:35:35 2016	(r299813)
@@ -1227,6 +1227,7 @@ snmp_bits2oct(char *str, struct asn_oid 
 
 	saved_errno = errno;
 	errno = 0;
+
 	v = strtoull(str, &endptr, 16);
 	if (errno != 0) {
 		warnx("Bad BITS value %s - %s", str, strerror(errno));
@@ -1265,7 +1266,9 @@ parse_bits(struct snmp_value *value, cha
 
 	saved_errno = errno;
 	errno = 0;
+
 	v = strtoull(string, &endptr, 16);
+
 	if (errno != 0) {
 		warnx("Bad BITS value %s - %s", string, strerror(errno));
 		errno = saved_errno;

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:28:22 2016	(r299812)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c	Sun May 15 00:35:35 2016	(r299813)
@@ -466,7 +466,7 @@ parse_ascii(char *ascii, uint8_t *binstr
 			return (-1);
 		}
 		binstr[count] = (uint8_t) val;
-		if ((size_t)++count >= binlen) {
+		if (++count >= binlen) {
 			warnx("Key %s too long - truncating to %zu octets",
 			    ascii, binlen);
 			break;
@@ -1058,8 +1058,8 @@ static char *
 snmp_oid2asn_oid(struct snmp_toolinfo *snmptoolctx, char *str,
     struct asn_oid *oid)
 {
+	int32_t i;
 	char string[MAXSTR + 1], *endptr;
-	size_t i;
 	struct snmp_object obj;
 
 	for (i = 0; i < MAXSTR; i++)