Date: Mon, 18 Dec 2006 22:36:40 -0600 From: Brooks Davis <brooks@one-eyed-alien.net> To: Matt Jacob <mjacob@freebsd.org> Cc: Perforce Change Reviews <perforce@freebsd.org> Subject: Re: PERFORCE change 111922 for review Message-ID: <20061219043640.GA92004@lor.one-eyed-alien.net> In-Reply-To: <200612190429.kBJ4ToCo012286@repoman.freebsd.org> References: <200612190429.kBJ4ToCo012286@repoman.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Tue, Dec 19, 2006 at 04:29:50AM +0000, Matt Jacob wrote: > http://perforce.freebsd.org/chv.cgi?CH=111922 > > Change 111922 by mjacob@mjexp_6 on 2006/12/19 04:29:03 > > Fix !($*(@$*@($* intmax goop (or lack thereof in RELENG_6). > > Affected files ... > > .. //depot/projects/mjexp_6/sys/geom/multipath/g_multipath.c#2 edit > > Differences ... > > ==== //depot/projects/mjexp_6/sys/geom/multipath/g_multipath.c#2 (text+ko) ==== > > @@ -560,9 +560,15 @@ > return; > } > if (pp0->mediasize != 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 != pp1->sectorsize) { > 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 [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (FreeBSD) iD8DBQFFh2xYXY6L6fI4GtQRAuGFAJ0eIYUj4vgXAhPFzclZ4Wr8w9DpwACgjNZc jlFw1EhJGhCn9KOAHn5BDUg= =zQpb -----END PGP SIGNATURE-----help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061219043640.GA92004>