svn commit: r299807 - in head: contrib/bsnmp/snmpd usr.sbin/bsnmpd/bsnmpd

[Garrett Cooper]

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

Log:
  Replace QUADFMT with %ju and QUADXFMT with %jx and cast values with uintmax_t
  
  This will cure some -Wformat warnings
  
  MFC after: 1 week
  Reported by: clang, gcc
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/contrib/bsnmp/snmpd/config.c
  head/usr.sbin/bsnmpd/bsnmpd/Makefile

Modified: head/contrib/bsnmp/snmpd/config.c
==============================================================================
--- head/contrib/bsnmp/snmpd/config.c	Sun May 15 00:08:09 2016	(r299806)
+++ head/contrib/bsnmp/snmpd/config.c	Sun May 15 00:10:37 2016	(r299807)
@@ -823,7 +823,8 @@ parse_oid(const char *varname, struct as
 	while (token == '.') {
 		if (gettoken() == TOK_NUM) {
 			if (numval > ASN_MAXID)
-				report("subid too large %#"QUADXFMT, numval);
+				report("subid too large %#jx",
+				    (uintmax_t)numval);
 			if (oid->len == ASN_MAXOIDLEN)
 				report("index too long");
 			if (gettoken() != ':')
@@ -878,7 +879,7 @@ parse_syntax_integer(struct snmp_value *
 	if (token != TOK_NUM)
 		report("bad INTEGER syntax");
 	if (numval > 0x7fffffff)
-		report("INTEGER too large %"QUADFMT, numval);
+		report("INTEGER too large %ju", (uintmax_t)numval);
 
 	value->v.integer = numval;
 	gettoken();

Modified: head/usr.sbin/bsnmpd/bsnmpd/Makefile
==============================================================================
--- head/usr.sbin/bsnmpd/bsnmpd/Makefile	Sun May 15 00:08:09 2016	(r299806)
+++ head/usr.sbin/bsnmpd/bsnmpd/Makefile	Sun May 15 00:10:37 2016	(r299807)
@@ -27,7 +27,7 @@ DEFSDIR= ${SHAREDIR}/snmp/defs
 
 CFLAGS+= -DSNMPTREE_TYPES
 CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I. -DUSE_LIBBEGEMOT
-CFLAGS+= -DUSE_TCPWRAPPERS -DQUADFMT='"llu"' -DQUADXFMT='"llx"'
+CFLAGS+= -DUSE_TCPWRAPPERS
 CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_ERR_H -DHAVE_STRLCPY
 LIBADD=	begemot bsnmp wrap