From owner-freebsd-current@FreeBSD.ORG Sat Apr 18 16:46:52 2015 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A1B96231; Sat, 18 Apr 2015 16:46:52 +0000 (UTC) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 440CA3EC; Sat, 18 Apr 2015 16:46:52 +0000 (UTC) Received: from tom.home (kostik@localhost [127.0.0.1]) by kib.kiev.ua (8.14.9/8.14.9) with ESMTP id t3IGkeH4030533 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Sat, 18 Apr 2015 19:46:40 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.9.2 kib.kiev.ua t3IGkeH4030533 Received: (from kostik@localhost) by tom.home (8.14.9/8.14.9/Submit) id t3IGkeu7030519; Sat, 18 Apr 2015 19:46:40 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 18 Apr 2015 19:46:40 +0300 From: Konstantin Belousov To: David Wolfskill Cc: current@freebsd.org, Takanori Watanabe Subject: Re: Fix for r281680 -- broke i386 world Message-ID: <20150418164640.GY2390@kib.kiev.ua> References: <20150418151702.GB36163@albert.catwhisker.org> <20150418153459.GX2390@kib.kiev.ua> <20150418163057.GD36163@albert.catwhisker.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150418163057.GD36163@albert.catwhisker.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on tom.home 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 16:46:52 -0000 On Sat, Apr 18, 2015 at 09:30:57AM -0700, David Wolfskill wrote: > On Sat, Apr 18, 2015 at 06:34:59PM +0300, Konstantin Belousov wrote: > > ... > > > - 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); > > > > > > return 0; > > > } > > > > The j modificator specifies that the type of the argument is (u)intmax_t. > > It is only a coincidense that uint64_t is max integer type, the arg should > > be casted to uintmax_t. > > > > Could you, please, update and test ? > > .... > > Thank you for the correction; the attached patch survives both i386 & > amd64 "make buildworld" ... and comes a bit closer to the above > specification. (I had tried "(uintmax_t)rp.le_features" at first; that > failed (at least on amd64), with: > > --- usr.sbin.all__D --- > /usr/src/usr.sbin/bluetooth/hccontrol/le.c:236:15: error: expected ')' > (uintmax_t)rp.le_features); > ^ > /usr/src/usr.sbin/bluetooth/hccontrol/le.c:235:8: note: to match this '(' > printf("LOCAL SUPPORTED: %d %d %ju\n", e, rp.status, > ^ > /usr/src/usr.sbin/bluetooth/hccontrol/le.c:253:60: error: expected ')' > printf("LE_STATUS: %d %d %jx\n", e, rp.status, (uintmax_t)rp.le_status); > ^ > /usr/src/usr.sbin/bluetooth/hccontrol/le.c:253:8: note: to match this '(' > printf("LE_STATUS: %d %d %jx\n", e, rp.status, (uintmax_t)rp.le_status); > ^ > 2 errors generated. > > So I took a bit of evasive action.) > > Peace, > david > -- > 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. > Index: usr.sbin/bluetooth/hccontrol/le.c > =================================================================== > --- usr.sbin/bluetooth/hccontrol/le.c (revision 281689) > +++ usr.sbin/bluetooth/hccontrol/le.c (working copy) > @@ -232,8 +232,8 @@ > NG_HCI_OCF_LE_READ_LOCAL_SUPPORTED_FEATURES), > (void *)&rp, &n); > > - printf("LOCAL SUPPORTED: %d %d %lu\n", e, rp.status, > - rp.le_features); > + printf("LOCAL SUPPORTED: %d %d %ju\n", e, rp.status, > + (u_int64_t)rp.le_features); > > return 0; > } > @@ -250,7 +250,7 @@ > NG_HCI_OCF_LE_READ_SUPPORTED_STATUS), > (void *)&rp, &n); > > - printf("LE_STATUS: %d %d %lx\n", e, rp.status, rp.le_status); > + printf("LE_STATUS: %d %d %jx\n", e, rp.status, (u_int64_t)rp.le_status); > > return 0; > } No, this is equally wrong. If the problem is due to uintmax_t not brought in to the scope by other dependencies, explicit #include should be added at the prologue. I am struggling for two days trying to pass my pending patches through make tinderbox. I added the uintmax_t version into the mix right now for the next try.