From owner-p4-projects@FreeBSD.ORG  Mon Jan  1 04:48:56 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C9C7B16A55D; Mon,  1 Jan 2007 04:48:56 +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 CDC1A16A4FF
	for <perforce@freebsd.org>; Mon,  1 Jan 2007 04:48:55 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id B417413C44C
	for <perforce@freebsd.org>; Mon,  1 Jan 2007 04:48:55 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l014mtNK076021
	for <perforce@freebsd.org>; Mon, 1 Jan 2007 04:48:55 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l014mt07076013
	for perforce@freebsd.org; Mon, 1 Jan 2007 04:48:55 GMT
	(envelope-from mjacob@freebsd.org)
Date: Mon, 1 Jan 2007 04:48:55 GMT
Message-Id: <200701010448.l014mt07076013@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 112393 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Jan 2007 04:48:57 -0000

http://perforce.freebsd.org/chv.cgi?CH=112393

Change 112393 by mjacob@mjexp_6 on 2007/01/01 04:48:37

	       Remove obfuscation that I added while mentally impaired.
	       A format of %z matches a size_t arg. For both RELENG_6
	       and HEAD.
	
	       Noticed by:     Scott

Affected files ...

.. //depot/projects/mjexp_6/sys/geom/multipath/g_multipath.c#4 edit

Differences ...

==== //depot/projects/mjexp_6/sys/geom/multipath/g_multipath.c#4 (text+ko) ====

@@ -560,15 +560,9 @@
 		return;
 	}
     	if (pp0->mediasize != pp1->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
+		    pp0->name, (size_t) pp0->mediasize,
+		    pp1->name, (size_t) pp1->mediasize);
 		return;
 	}
     	if (pp0->sectorsize != pp1->sectorsize) {