svn commit: r229134 - stable/9/cddl/contrib/opensolaris/lib/libdtrace/common

[Dimitry Andric]

Author: dim
Date: Sat Dec 31 18:53:11 2011
New Revision: 229134
URL: http://svn.freebsd.org/changeset/base/229134

Log:
  MFC r228580:
  
  In cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.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.

Modified:
  stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c
Directory Properties:
  stable/9/cddl/contrib/opensolaris/   (props changed)

Modified: stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c
==============================================================================
--- stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c	Sat Dec 31 18:49:46 2011	(r229133)
+++ stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c	Sat Dec 31 18:53:11 2011	(r229134)
@@ -335,7 +335,8 @@ dt_handle_cpudrop(dtrace_hdl_t *dtp, pro
 	}
 
 	(void) snprintf(s, size, "%llu %sdrop%s on CPU %d\n",
-	    howmany, what == DTRACEDROP_PRINCIPAL ? "" : "aggregation ",
+	    (u_longlong_t)howmany,
+	    what == DTRACEDROP_PRINCIPAL ? "" : "aggregation ",
 	    howmany > 1 ? "s" : "", cpu);
 
 	if (dtp->dt_drophdlr == NULL)
@@ -427,7 +428,8 @@ dt_handle_status(dtrace_hdl_t *dtp, dtra
 			size = sizeof (str);
 		}
 
-		(void) snprintf(s, size, "%llu %s%s%s\n", nval - oval,
+		(void) snprintf(s, size, "%llu %s%s%s\n",
+		    (u_longlong_t)(nval - oval),
 		    _dt_droptab[i].dtdrt_str, (nval - oval > 1) ? "s" : "",
 		    _dt_droptab[i].dtdrt_msg != NULL ?
 		    _dt_droptab[i].dtdrt_msg : "");