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
This commit is contained in:
parent
8ac4e8ebc3
commit
edf500a77a
@ -335,7 +335,8 @@ dt_handle_cpudrop(dtrace_hdl_t *dtp, processorid_t cpu,
|
||||
}
|
||||
|
||||
(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, dtrace_status_t *old, dtrace_status_t *new)
|
||||
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 : "");
|
||||
|
Loading…
Reference in New Issue
Block a user