Author: adrian
Date: Wed Jan 2 18:12:06 2013
New Revision: 244963
URL: http://svnweb.freebsd.org/changeset/base/244963
Log:
* Add missing err() string formats;
* Fix up a printf() type mismatch.
Thanks to: clang
Modified:
head/tools/tools/ath/athkey/athkey.c
Modified: head/tools/tools/ath/athkey/athkey.c
==============================================================================
--- head/tools/tools/ath/athkey/athkey.c Wed Jan 2 18:09:30 2013
(r244962)
+++ head/tools/tools/ath/athkey/athkey.c Wed Jan 2 18:12:06 2013
(r244963)
@@ -83,8 +83,8 @@ getdata(const char *arg, u_int8_t *data,
}
if (len > maxlen) {
fprintf(stderr,
- "%s: too much data in %s, max %u bytes\n",
- progname, arg, maxlen);
+ "%s: too much data in %s, max %llu bytes\n",
+ progname, arg, (unsigned long long) maxlen);
}
data[len++] = (b0<<4) | b1;
}
@@ -178,7 +178,7 @@ main(int argc, char *argv[])
atd.ad_in_data = (caddr_t) &keyix;
atd.ad_in_size = sizeof(u_int16_t);
if (ioctl(s, SIOCGATHDIAG, &atd) < 0)
- err(1, atd.ad_name);
+ err(1, "ioctl: %s", atd.ad_name);
return 0;
case HAL_DIAG_SETKEY:
if (argc != 3 && argc != 4)
@@ -196,7 +196,7 @@ main(int argc, char *argv[])
atd.ad_in_data = (caddr_t) &setkey;
atd.ad_in_size = sizeof(setkey);
if (ioctl(s, SIOCGATHDIAG, &atd) < 0)
- err(1, atd.ad_name);
+ err(1, "ioctl: %s", atd.ad_name);
return 0;
}
return -1;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
