From owner-svn-src-all@FreeBSD.ORG  Fri Dec 16 15:04:47 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C85A2106564A;
	Fri, 16 Dec 2011 15:04:47 +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 B662F8FC0C;
	Fri, 16 Dec 2011 15:04:47 +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 pBGF4lG6012543;
	Fri, 16 Dec 2011 15:04:47 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBGF4lYp012541;
	Fri, 16 Dec 2011 15:04:47 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201112161504.pBGF4lYp012541@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 16 Dec 2011 15:04:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228579 -
	head/cddl/contrib/opensolaris/lib/libdtrace/common
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Dec 2011 15:04:47 -0000

Author: dim
Date: Fri Dec 16 15:04:47 2011
New Revision: 228579
URL: http://svn.freebsd.org/changeset/base/228579

Log:
  In cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c, some
  uint64_t values are snprintf'd using %llx.  On amd64, uint64_t is
  typedef'd as unsigned long, so cast the values to u_longlong_t, as is
  done similarly in the rest of the file.
  
  MFC after:	1 week

Modified:
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c

Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c	Fri Dec 16 15:00:56 2011	(r228578)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c	Fri Dec 16 15:04:47 2011	(r228579)
@@ -873,7 +873,7 @@ dt_print_stack(dtrace_hdl_t *dtp, FILE *
 			if (pc > sym.st_value) {
 				(void) snprintf(c, sizeof (c), "%s`%s+0x%llx",
 				    dts.dts_object, dts.dts_name,
-				    pc - sym.st_value);
+				    (u_longlong_t)(pc - sym.st_value));
 			} else {
 				(void) snprintf(c, sizeof (c), "%s`%s",
 				    dts.dts_object, dts.dts_name);
@@ -886,9 +886,10 @@ dt_print_stack(dtrace_hdl_t *dtp, FILE *
 			 */
 			if (dtrace_lookup_by_addr(dtp, pc, NULL, &dts) == 0) {
 				(void) snprintf(c, sizeof (c), "%s`0x%llx",
-				    dts.dts_object, pc);
+				    dts.dts_object, (u_longlong_t)pc);
 			} else {
-				(void) snprintf(c, sizeof (c), "0x%llx", pc);
+				(void) snprintf(c, sizeof (c), "0x%llx",
+				    (u_longlong_t)pc);
 			}
 		}