diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2015-08-18 14:58:27 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2015-08-18 16:15:33 +0000 |
| commit | 2479ef0bceaa35ea353fd0ea372cf31d5eb8a216 (patch) | |
| tree | daaab70f0425407b7aed81127b485858eed81ce9 /block.c | |
| parent | f9b455cfd241593f4fbe96c51f9b511fab6c8fc3 (diff) | |
| download | strace-2479ef0bceaa35ea353fd0ea372cf31d5eb8a216.tar.gz | |
Fix printing tracee's long integers
Replace ambiguous printnum_long that used to fetch native long integers
from tracee's memory with printnum_ptr, printnum_slong, and printnum_ulong
that fetch tracee's pointer, signed long, and unsigned long integers.
* defs.h (printnum_long, printpair_long): Remove prototypes.
(printnum_int64, printpair_int64): Remove macros, declare functions
unconditionally.
[SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4] (printnum_long_int):
New prototype.
(printnum_ptr, printnum_slong, printnum_ulong): New macros.
* aio.c (sys_io_setup): Use printnum_ulong.
* block.c (block_ioctl): Use printnum_slong and printnum_ulong.
* get_robust_list.c (sys_get_robust_list): Use printnum_ptr
and printnum_ulong.
* io.c (print_off_t): Remove.
(sys_sendfile): Use printnum_ulong.
* ipc.c (sys_semctl): Use printnum_ptr.
* prctl.c (sys_prctl): Likewise.
* process.c (sys_ptrace): Likewise.
* rtc.c (rtc_ioctl): Use printnum_ulong.
* util.c (printnum_long, printpair_long): Remove.
(printnum_int64, printpair_int64): Define unconditionally.
[SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4] (printnum_long_int):
New function.
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Elvira Khabirova <lineprinter0@gmail.com>
Diffstat (limited to 'block.c')
| -rw-r--r-- | block.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -165,7 +165,7 @@ block_ioctl(struct tcb *tcp, const unsigned int code, const long arg) if (entering(tcp)) return 0; tprints(", "); - printnum_long(tcp, arg, "%ld"); + printnum_slong(tcp, arg); break; /* returns an unsigned long */ @@ -173,7 +173,7 @@ block_ioctl(struct tcb *tcp, const unsigned int code, const long arg) if (entering(tcp)) return 0; tprints(", "); - printnum_long(tcp, arg, "%lu"); + printnum_ulong(tcp, arg); break; #ifdef HAVE_BLKGETSIZE64 |