d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace QUADFMT with %ju and QUADXFMT with %jx and cast values with uintmax_t

Browse Source 
This will cure some -Wformat warnings

MFC after: 1 week
Reported by: clang, gcc
Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
Enji Cooper 2016-05-15 00:10:37 +00:00
parent 70e366f272
commit d208c8fa3f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=299807
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/bsnmp/snmpd/config.c
View File

@ -823,7 +823,8 @@ parse_oid(const char *varname, struct asn_oid *oid)
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 *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();

2
usr.sbin/bsnmpd/bsnmpd/Makefile
View File

@ -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