From 53ec9ab5557b4611f4e3d0830a681aa38f524f0b Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Sun, 25 Dec 2016 02:02:36 +0000 Subject: [PATCH] statfs64: change size argument type from unsigned long to kernel_ureg_t * defs.h (print_struct_statfs64): Change size argument type from unsigned long to kernel_ureg_t. * print_statfs.c (print_struct_statfs64): Likewise. * fetch_struct_statfs.c (fetch_struct_statfs64): Likewise. * fstatfs64.c (SYS_FUNC(fstatfs64)): Pass size argument directly to print_struct_statfs64. * statfs64.c (SYS_FUNC(statfs64)): Likewise. --- defs.h | 2 +- fetch_struct_statfs.c | 2 +- fstatfs64.c | 6 ++---- print_statfs.c | 2 +- statfs64.c | 6 ++---- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/defs.h b/defs.h index 56f52fed..d8a96e73 100644 --- a/defs.h +++ b/defs.h @@ -713,7 +713,7 @@ extern void print_struct_statfs(struct tcb *, kernel_ureg_t addr); extern void -print_struct_statfs64(struct tcb *, kernel_ureg_t addr, unsigned long size); +print_struct_statfs64(struct tcb *, kernel_ureg_t addr, kernel_ureg_t size); extern void print_ifindex(unsigned int); diff --git a/fetch_struct_statfs.c b/fetch_struct_statfs.c index 9379550e..c22b2446 100644 --- a/fetch_struct_statfs.c +++ b/fetch_struct_statfs.c @@ -80,7 +80,7 @@ MPERS_PRINTER_DECL(bool, fetch_struct_statfs, MPERS_PRINTER_DECL(bool, fetch_struct_statfs64, struct tcb *const tcp, const kernel_ureg_t addr, - const unsigned long size, struct strace_statfs *const p) + const kernel_ureg_t size, struct strace_statfs *const p) { struct_statfs64 b; diff --git a/fstatfs64.c b/fstatfs64.c index 63eb3dfa..268047c3 100644 --- a/fstatfs64.c +++ b/fstatfs64.c @@ -2,13 +2,11 @@ SYS_FUNC(fstatfs64) { - const unsigned long size = tcp->u_arg[1]; - if (entering(tcp)) { printfd(tcp, tcp->u_arg[0]); - tprintf(", %lu, ", size); + tprintf(", %lu, ", tcp->u_arg[1]); } else { - print_struct_statfs64(tcp, tcp->u_arg[2], size); + print_struct_statfs64(tcp, tcp->u_arg[2], tcp->u_arg[1]); } return 0; } diff --git a/print_statfs.c b/print_statfs.c index 0fd4d892..04addd07 100644 --- a/print_statfs.c +++ b/print_statfs.c @@ -92,7 +92,7 @@ print_struct_statfs(struct tcb *const tcp, const kernel_ureg_t addr) void print_struct_statfs64(struct tcb *const tcp, const kernel_ureg_t addr, - const unsigned long size) + const kernel_ureg_t size) { #ifdef HAVE_STRUCT_STATFS64 struct strace_statfs b; diff --git a/statfs64.c b/statfs64.c index f4598317..45a22d32 100644 --- a/statfs64.c +++ b/statfs64.c @@ -2,13 +2,11 @@ SYS_FUNC(statfs64) { - const unsigned long size = tcp->u_arg[1]; - if (entering(tcp)) { printpath(tcp, tcp->u_arg[0]); - tprintf(", %lu, ", size); + tprintf(", %lu, ", tcp->u_arg[1]); } else { - print_struct_statfs64(tcp, tcp->u_arg[2], size); + print_struct_statfs64(tcp, tcp->u_arg[2], tcp->u_arg[1]); } return 0; } -- 2.50.1