]> granicus.if.org Git - strace/commitdiff
printrusage*: change tracee address argument type from long to kernel_ureg_t
authorDmitry V. Levin <ldv@altlinux.org>
Thu, 22 Dec 2016 00:54:18 +0000 (00:54 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Sun, 25 Dec 2016 11:32:44 +0000 (11:32 +0000)
* defs.h [ALPHA] (printrusage32): Change address argument type
from long to kernel_ureg_t.
* printrusage.c (printrusage): Likewise.
[ALPHA] (printrusage32): Likewise.
* wait.c (printwaitn): Change the type of tracee address argument
of print_rusage from long to kernel_ureg_t.

defs.h
printrusage.c
wait.c

diff --git a/defs.h b/defs.h
index 7873edbfcf658e875ed5129f9c8b38babb4eaf84..7fd50f472e88dce12e8862f3632718af3d4ecf39 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -813,7 +813,7 @@ typedef struct {
 } timeval32_t;
 
 extern void print_timeval32_t(const timeval32_t *);
-extern void printrusage32(struct tcb *, long);
+extern void printrusage32(struct tcb *, kernel_ureg_t);
 extern const char *sprint_timeval32(struct tcb *tcp, kernel_ureg_t);
 extern void print_timeval32(struct tcb *tcp, kernel_ureg_t);
 extern void print_timeval32_pair(struct tcb *tcp, kernel_ureg_t);
index 09f8d453ee1df3848ad7a704b49d057823d2ab11..df5b45835b5197e25388f5b25db1537c14be7299 100644 (file)
@@ -37,7 +37,8 @@ typedef struct rusage rusage_t;
 
 #include MPERS_DEFS
 
-MPERS_PRINTER_DECL(void, printrusage, struct tcb *tcp, long addr)
+MPERS_PRINTER_DECL(void, printrusage,
+                  struct tcb *const tcp, const kernel_ureg_t addr)
 {
        rusage_t ru;
 
@@ -74,7 +75,7 @@ MPERS_PRINTER_DECL(void, printrusage, struct tcb *tcp, long addr)
 
 #ifdef ALPHA
 void
-printrusage32(struct tcb *tcp, long addr)
+printrusage32(struct tcb *const tcp, const kernel_ureg_t addr)
 {
        struct rusage32 {
                timeval32_t ru_utime;           /* user time used */
diff --git a/wait.c b/wait.c
index 64bd3b7d3efd8aa0f0a326e377ec0aa89aab0e59..401cae2a83214a9b019b4fb9e799f77884e196d4 100644 (file)
--- a/wait.c
+++ b/wait.c
@@ -117,7 +117,8 @@ printstatus(int status)
 }
 
 static int
-printwaitn(struct tcb *tcp, void (*const print_rusage)(struct tcb *, long))
+printwaitn(struct tcb *const tcp,
+          void (*const print_rusage)(struct tcb *, kernel_ureg_t))
 {
        if (entering(tcp)) {
                /* On Linux, kernel-side pid_t is typedef'ed to int