From owner-svn-src-stable-9@FreeBSD.ORG  Sat Dec 31 19:53:00 2011
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BFDFA106564A;
	Sat, 31 Dec 2011 19:53:00 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A8DC18FC0A;
	Sat, 31 Dec 2011 19:53:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBVJr0lS080296;
	Sat, 31 Dec 2011 19:53:00 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBVJr09C080294;
	Sat, 31 Dec 2011 19:53:00 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201112311953.pBVJr09C080294@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 31 Dec 2011 19:53:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229146 -
	stable/9/cddl/contrib/opensolaris/tools/ctf/cvt
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 31 Dec 2011 19:53:00 -0000

Author: dim
Date: Sat Dec 31 19:53:00 2011
New Revision: 229146
URL: http://svn.freebsd.org/changeset/base/229146

Log:
  MFC r228597:
  
  In cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c, a size_t is passed
  to fprintf as a field width.  It should be an int instead, so cast it.

Modified:
  stable/9/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c
Directory Properties:
  stable/9/cddl/contrib/opensolaris/   (props changed)

Modified: stable/9/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c
==============================================================================
--- stable/9/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c	Sat Dec 31 19:50:55 2011	(r229145)
+++ stable/9/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c	Sat Dec 31 19:53:00 2011	(r229146)
@@ -228,7 +228,7 @@ usage(void)
 	    "\n"
 	    "  Note: if -L labelenv is specified and labelenv is not set in\n"
 	    "  the environment, a default value is used.\n",
-	    progname, progname, strlen(progname), " ",
+	    progname, progname, (int)strlen(progname), " ",
 	    progname, progname);
 }