diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2016-06-11 01:28:21 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2016-06-11 09:26:49 +0000 |
| commit | 484326dbd8f8e02983e37498b4b5fa990d16b536 (patch) | |
| tree | 63bfc9c3f725cee0ad8d59b414389870492536aa /printsiginfo.c | |
| parent | 87baaec12e6ac5aae0b5ea09087b6c07e6f1710f (diff) | |
| download | strace-484326dbd8f8e02983e37498b4b5fa990d16b536.tar.gz | |
Consistently use printaddr for printing addresses
* bjm.c (SYS_FUNC(init_module)): Use printaddr.
* clone.c (SYS_FUNC(clone)): Likewise.
* evdev.c (ff_effect_ioctl): Likewise.
* mtd.c (decode_mtd_oob_buf): Likewise.
* net.c (SYS_FUNC(sendmmsg), SYS_FUNC(recvmmsg), SYS_FUNC(getsockopt)):
Likewise.
* print_sigevent.c (print_sigevent): Likewise.
* printsiginfo.c (printsigval, print_si_info): Likewise.
* signal.c (decode_new_sigaction): Likewise.
* sysmips.c (SYS_FUNC(sysmips)): Likewise.
* util.c (printpathn, printstr, umoven_or_printaddr): Likewise.
* v4l2.c (print_v4l2_buffer, print_v4l2_framebuffer,
umoven_or_printaddr_ignore_syserror): Likewise.
* tests/net-icmp_filter.c (main): Update.
Based on patch by Eugene Syromyatnikov <evgsyr@gmail.com>.
Diffstat (limited to 'printsiginfo.c')
| -rw-r--r-- | printsiginfo.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/printsiginfo.c b/printsiginfo.c index 98755b28f..699460f3f 100644 --- a/printsiginfo.c +++ b/printsiginfo.c @@ -76,8 +76,9 @@ printsigsource(const siginfo_t *sip) static void printsigval(const siginfo_t *sip) { - tprintf(", si_value={int=%d, ptr=%#lx}", - sip->si_int, (unsigned long) sip->si_ptr); + tprintf(", si_value={int=%d, ptr=", sip->si_int); + printaddr((unsigned long) sip->si_ptr); + tprints("}"); } static void @@ -176,8 +177,8 @@ print_si_info(const siginfo_t *sip) break; case SIGILL: case SIGFPE: case SIGSEGV: case SIGBUS: - tprintf(", si_addr=%#lx", - (unsigned long) sip->si_addr); + tprints(", si_addr="); + printaddr((unsigned long) sip->si_addr); break; case SIGPOLL: switch (sip->si_code) { @@ -189,8 +190,9 @@ print_si_info(const siginfo_t *sip) break; #ifdef HAVE_SIGINFO_T_SI_SYSCALL case SIGSYS: - tprintf(", si_call_addr=%#lx, si_syscall=__NR_%s, si_arch=", - (unsigned long) sip->si_call_addr, + tprints(", si_call_addr="); + printaddr((unsigned long) sip->si_call_addr); + tprintf(", si_syscall=__NR_%s, si_arch=", syscall_name((unsigned) sip->si_syscall)); printxval(audit_arch, sip->si_arch, "AUDIT_ARCH_???"); break; |