From owner-freebsd-current@FreeBSD.ORG Sat Apr 18 15:17:09 2015 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A4D144B0; Sat, 18 Apr 2015 15:17:09 +0000 (UTC) Received: from albert.catwhisker.org (mx.catwhisker.org [198.144.209.73]) (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 73BEFA84; Sat, 18 Apr 2015 15:17:08 +0000 (UTC) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.14.9/8.14.9) with ESMTP id t3IFH2Eg061211; Sat, 18 Apr 2015 08:17:02 -0700 (PDT) (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.14.9/8.14.9/Submit) id t3IFH2Uc061210; Sat, 18 Apr 2015 08:17:02 -0700 (PDT) (envelope-from david) Date: Sat, 18 Apr 2015 08:17:02 -0700 From: David Wolfskill To: current@freebsd.org Cc: Takanori Watanabe Subject: Fix for r281680 -- broke i386 world Message-ID: <20150418151702.GB36163@albert.catwhisker.org> Mail-Followup-To: David Wolfskill , current@freebsd.org, Takanori Watanabe MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="h+CsNYkJBPxpZ+B/" Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Apr 2015 15:17:09 -0000 --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/--