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.

diff --git a/defs.h b/defs.h
index 56f52fed5a18cb6f185a78d1e11a89891d656f3c..d8a96e73e9c5b92d48367bbf899dc7c8a417fa71 100644 (file)
--- 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 9379550e67b768f6788012c8ddc273eaa3ffaff6..c22b2446eca96822d336bca9af387b4069b59e80 100644 (file)
--- 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 63eb3dfa62756eed3153f890a8ed736079b53d80..268047c38e1c1260fb70ec519bd107e9513d580e 100644 (file)
--- 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 0fd4d89252ef91f03f675406982a622f540aff12..04addd07f86679c2b42d82e31e4b7bd5cdebf480 100644 (file)
--- 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 f45983176d23e84c68ca004051bf40aecf283645..45a22d327da8a5f90a066edcbf4607e553ee0bf7 100644 (file)
--- 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;
 }