diff options
| author | dim <dim@FreeBSD.org> | 2011-12-16 15:04:47 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2011-12-16 15:04:47 +0000 |
| commit | c9021301d1dd1e98985b809f54fd4c414a1b2c90 (patch) | |
| tree | b13412564c01d30bb34a8af201cd03108789ada6 /cddl | |
| parent | 5780802b6cec44c8398568043c1dbf8bd3d4c241 (diff) | |
| download | FreeBSD-src-c9021301d1dd1e98985b809f54fd4c414a1b2c90.zip FreeBSD-src-c9021301d1dd1e98985b809f54fd4c414a1b2c90.tar.gz | |
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
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c index 911478e..af4af8a 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c @@ -873,7 +873,7 @@ dt_print_stack(dtrace_hdl_t *dtp, FILE *fp, const char *format, 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 *fp, const char *format, */ 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); } } |
