From owner-svn-src-user@freebsd.org Sun May 15 00:35:37 2016 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0F870B32A37 for ; Sun, 15 May 2016 00:35:37 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B7A13126B; Sun, 15 May 2016 00:35:36 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4F0ZZhb006844; Sun, 15 May 2016 00:35:35 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4F0ZZul006842; Sun, 15 May 2016 00:35:35 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201605150035.u4F0ZZul006842@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 15 May 2016 00:35:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r299813 - user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 May 2016 00:35:37 -0000 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++)