Date: Sat, 18 Apr 2015 08:17:02 -0700 From: David Wolfskill <david@catwhisker.org> To: current@freebsd.org Cc: Takanori Watanabe <takawata@FreeBSD.org> Subject: Fix for r281680 -- broke i386 world Message-ID: <20150418151702.GB36163@albert.catwhisker.org>
next in thread | raw e-mail | index | archive | help
--h+CsNYkJBPxpZ+B/
Content-Type: multipart/mixed; boundary="A1Iwnsx6rNfRhs6P"
Content-Disposition: inline
--A1Iwnsx6rNfRhs6P
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Head/amd64 @ r281689 built OK, but my i386 build failed:
=2E..
--- usr.sbin.all__D ---
--- all_subdir_bluetooth ---
/usr/src/usr.sbin/bluetooth/hccontrol/le.c:236:4: error: format specifies t=
ype 'unsigned long' but the argument has type 'u_int64_t' (aka 'unsigned lo=
ng long') [-Werror,-Wformat]
rp.le_features);
^~~~~~~~~~~~~~
/usr/src/usr.sbin/bluetooth/hccontrol/le.c:253:49: error: format specifies =
type 'unsigned long' but the argument has type 'u_int64_t' (aka 'unsigned l=
ong long') [-Werror,-Wformat]
printf("LE_STATUS: %d %d %lx\n", e, rp.status, rp.le_status);
~~~ ^~~~~~~~~~~~
%llx
2 errors generated.
=2E...
The attached patch allows i386 to build, and I then tested to verify
that amd64 still built. (I don't have Bluetooth devices, so I
cannot test its operation.)
Peace,
david
--=20
David H. Wolfskill david@catwhisker.org
Those who murder in the name of God or prophet are blasphemous cowards.
See http://www.catwhisker.org/~david/publickey.gpg for my public key.
--A1Iwnsx6rNfRhs6P
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="bluetooth.diff"
Content-Transfer-Encoding: quoted-printable
Index: usr.sbin/bluetooth/hccontrol/le.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- usr.sbin/bluetooth/hccontrol/le.c (revision 281689)
+++ usr.sbin/bluetooth/hccontrol/le.c (working copy)
@@ -232,7 +232,7 @@
NG_HCI_OCF_LE_READ_LOCAL_SUPPORTED_FEATURES),=20
(void *)&rp, &n);
=20
- printf("LOCAL SUPPORTED: %d %d %lu\n", e, rp.status,
+ printf("LOCAL SUPPORTED: %d %d %ju\n", e, rp.status,
rp.le_features);
=20
return 0;
@@ -250,7 +250,7 @@
NG_HCI_OCF_LE_READ_SUPPORTED_STATUS),
(void *)&rp, &n);
=20
- printf("LE_STATUS: %d %d %lx\n", e, rp.status, rp.le_status);
+ printf("LE_STATUS: %d %d %jx\n", e, rp.status, rp.le_status);
=20
return 0;
}
--A1Iwnsx6rNfRhs6P--
--h+CsNYkJBPxpZ+B/
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQJ8BAEBCgBmBQJVMnVtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4RThEMDY4QTIxMjc1MDZFRDIzODYzRTc4
QTY3RjlDOERFRjQxOTNCAAoJEIpn+cje9Bk7C9MP/1UdgVwEDPyWDpWjpLCjRnY5
f3BVi10BP5Wqy4P4n3CFP+sJ+PGbfDfDiHMLmstXRrBddGVZH1EYZJTWOgZx0Dcw
RA2wcM8zPyT8VFAmJfxVrniF4MdaWuTdmBAnZFlLZKoJ7s34THfiQ0la4RelIJvL
D+U0MzNEg0qqQ52EAm3eZSwB4NZajSzBJLINIbNGxlkOL8KjYSQLMyfyQJJYW+YL
i/PmCuEO0oc7uuyMQegMlAMEbe4gLqwSCwt5c9p7KhNUBZYY6Cb04/OykqrwKzgP
iBFUt8uMmPCZrroCZCL4c0GAOAhxuiLoALt73vWi1si1vXA1TFb0aOLXSHvnOBq9
SxbUOU7gUmuMf0uSSq8//QlDEeYAmBHlekWUouRWI/n/Lygsu/8u2BjDO5RzXsIE
yewIr2/+I6Ir9N0dnYeCmjhX880LHCBfM7+RCctDwSHYzrIPZeeFebVZUZOuHhYG
U1KI7eayPRR+B3JeVeQjG7bup6pEa935wlrxF9UHXPS4EOrSAsD7C6KdwDNIALBb
BTrssRRKByHzpEB9NBu+a65J3EBHgHjRcgaJLBG7gO3cSlbQ1afrb3ftpcZDq6aY
gGlZ6jNIgGAJuSQe7D0cJ6mZUU7sJiZwEYL9oZqK1wArNPjASHx/jUEtYP8a3cXl
/oKM1+mbWI9rPIkyNWjc
=+/9R
-----END PGP SIGNATURE-----
--h+CsNYkJBPxpZ+B/--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150418151702.GB36163>