Simplify print_lld_from_low_high_val ifdefery

[strace] / execve.c

diff --git a/execve.c b/execve.c
index d2ff9f740435cf96320d61b3df8be1d4f5eaf6db..6e45b11bf4639cd1ea795fe8453773f125b2285c 100644 (file)
--- a/execve.c
+++ b/execve.c
@@ -34,7 +34,7 @@
 #include "defs.h"
 
 static void
-printargv(struct tcb *tcp, long addr)
+printargv(struct tcb *const tcp, kernel_ulong_t addr)
 {
        if (!addr || !verbose(tcp)) {
                printaddr(addr);
@@ -49,8 +49,8 @@ printargv(struct tcb *tcp, long addr)
        for (n = 0; addr; sep = ", ", addr += wordsize, ++n) {
                union {
                        unsigned int p32;
-                       unsigned long p64;
-                       char data[sizeof(long)];
+                       kernel_ulong_t p64;
+                       char data[sizeof(kernel_ulong_t)];
                } cp;
 
                if (umoven(tcp, addr, wordsize, cp.data)) {
@@ -70,13 +70,13 @@ printargv(struct tcb *tcp, long addr)
                        break;
                }
                tprints(sep);
-               printstr(tcp, wordsize < sizeof(cp.p64) ? cp.p32 : cp.p64, -1);
+               printstr(tcp, wordsize < sizeof(cp.p64) ? cp.p32 : cp.p64);
        }
        tprints("]");
 }
 
 static void
-printargc(struct tcb *tcp, long addr)
+printargc(struct tcb *const tcp, kernel_ulong_t addr)
 {
        if (!addr || !verbose(tcp)) {
                printaddr(addr);