From owner-p4-projects@FreeBSD.ORG Tue Dec 19 05:12:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10D1D16A407; Tue, 19 Dec 2006 05:12:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C744C16A40F; Tue, 19 Dec 2006 05:12:36 +0000 (UTC) (envelope-from brooks@lor.one-eyed-alien.net) Received: from lor.one-eyed-alien.net (grnl-static-02-0046.dsl.iowatelecom.net [69.66.56.110]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E1AC43CA2; Tue, 19 Dec 2006 05:11:06 +0000 (GMT) (envelope-from brooks@lor.one-eyed-alien.net) Received: from lor.one-eyed-alien.net (localhost [127.0.0.1]) by lor.one-eyed-alien.net (8.13.8/8.13.8) with ESMTP id kBJ4aeeY092139; Mon, 18 Dec 2006 22:36:40 -0600 (CST) (envelope-from brooks@lor.one-eyed-alien.net) Received: (from brooks@localhost) by lor.one-eyed-alien.net (8.13.8/8.13.8/Submit) id kBJ4ae2r092138; Mon, 18 Dec 2006 22:36:40 -0600 (CST) (envelope-from brooks) Date: Mon, 18 Dec 2006 22:36:40 -0600 From: Brooks Davis To: Matt Jacob Message-ID: <20061219043640.GA92004@lor.one-eyed-alien.net> References: <200612190429.kBJ4ToCo012286@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="2oS5YaxWCcQjTEyO" Content-Disposition: inline In-Reply-To: <200612190429.kBJ4ToCo012286@repoman.freebsd.org> User-Agent: Mutt/1.5.11 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 111922 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2006 05:12:37 -0000 --2oS5YaxWCcQjTEyO Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Dec 19, 2006 at 04:29:50AM +0000, Matt Jacob wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D111922 >=20 > Change 111922 by mjacob@mjexp_6 on 2006/12/19 04:29:03 >=20 > Fix !($*(@$*@($* intmax goop (or lack thereof in RELENG_6). >=20 > Affected files ... >=20 > .. //depot/projects/mjexp_6/sys/geom/multipath/g_multipath.c#2 edit >=20 > Differences ... >=20 > =3D=3D=3D=3D //depot/projects/mjexp_6/sys/geom/multipath/g_multipath.c#2 = (text+ko) =3D=3D=3D=3D >=20 > @@ -560,9 +560,15 @@ > return; > } > if (pp0->mediasize !=3D pp1->mediasize) { > - gctl_error(req, "Provider %s has mediasize %zu; Provider %s " > - "has mediasize %zu", pp0->name, (intmax_t) pp0->mediasize, > +#if __FreeBSD_version < 700000 > + gctl_error(req, "Provider %s is %llu; Provider %s is %llu", > + pp0->name, (unsigned long long) pp0->mediasize, > + pp1->name, (unsigned long long) pp1->mediasize); > +#else > + gctl_error(req, "Provider %s is %zu; Provider %s is %zu", > + pp0->name, (intmax_t) pp0->mediasize, > pp1->name, (intmax_t) pp1->mediasize); > +#endif > return; > } > if (pp0->sectorsize !=3D pp1->sectorsize) { >=20 I'm pretty sure this isn't right and you're seeing something else. intmax_t has been around in the tree since at least 2002. It is the case that %zu is the wrong format for intmax_t. 'z' is the size_t modifier. For intmax_t you want 'j' instead. -- Brooks --2oS5YaxWCcQjTEyO Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (FreeBSD) iD8DBQFFh2xYXY6L6fI4GtQRAuGFAJ0eIYUj4vgXAhPFzclZ4Wr8w9DpwACgjNZc jlFw1EhJGhCn9KOAHn5BDUg= =zQpb -----END PGP SIGNATURE----- --2oS5YaxWCcQjTEyO--