Author: dim
Date: Fri Dec 16 15:12:42 2011
New Revision: 228580
URL: http://svn.freebsd.org/changeset/base/228580
Log:
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.
MFC after: 1 week
Modified:
head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c
Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c Fri Dec
16 15:04:47 2011 (r228579)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c Fri Dec
16 15:12:42 2011 (r228580)
@@ -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 : "");
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
