Simplify print_lld_from_low_high_val ifdefery

[strace] / signal.c

diff --git a/signal.c b/signal.c
index e332982fb7bdb56b6475f623dd5b570f4bb5c3c3..30838b2347d369f95d3487d03804c19801a7534a 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -115,13 +115,13 @@
  */
 
 static const char *
-get_sa_handler_str(kernel_ureg_t handler)
+get_sa_handler_str(kernel_ulong_t handler)
 {
        return xlookup(sa_handler_values, handler);
 }
 
 static void
-print_sa_handler(kernel_ureg_t handler)
+print_sa_handler(kernel_ulong_t handler)
 {
        const char *sa_handler_str = get_sa_handler_str(handler);
 
@@ -242,8 +242,8 @@ printsignal(int nr)
 }
 
 static void
-print_sigset_addr_len_limit(struct tcb *const tcp, const kernel_ureg_t addr,
-                           const kernel_ureg_t len, const unsigned int min_len)
+print_sigset_addr_len_limit(struct tcb *const tcp, const kernel_ulong_t addr,
+                           const kernel_ulong_t len, const unsigned int min_len)
 {
        /*
         * Here len is usually equal to NSIG / 8 or current_wordsize.
@@ -260,8 +260,8 @@ print_sigset_addr_len_limit(struct tcb *const tcp, const kernel_ureg_t addr,
 }
 
 void
-print_sigset_addr_len(struct tcb *const tcp, const kernel_ureg_t addr,
-                     const kernel_ureg_t len)
+print_sigset_addr_len(struct tcb *const tcp, const kernel_ulong_t addr,
+                     const kernel_ulong_t len)
 {
        print_sigset_addr_len_limit(tcp, addr, len, current_wordsize);
 }
@@ -306,7 +306,7 @@ struct old_sigaction32 {
 };
 
 static void
-decode_old_sigaction(struct tcb *const tcp, const kernel_ureg_t addr)
+decode_old_sigaction(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        struct old_sigaction sa;
 
@@ -463,7 +463,7 @@ SYS_FUNC(rt_sigprocmask)
        }
        else {
                print_sigset_addr_len(tcp, tcp->u_arg[2], tcp->u_arg[3]);
-               tprintf(", %lu", tcp->u_arg[3]);
+               tprintf(", %" PRI_klu, tcp->u_arg[3]);
        }
        return 0;
 }
@@ -497,7 +497,7 @@ struct new_sigaction32
 };
 
 static void
-decode_new_sigaction(struct tcb *const tcp, const kernel_ureg_t addr)
+decode_new_sigaction(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        struct new_sigaction sa;
 
@@ -561,11 +561,11 @@ SYS_FUNC(rt_sigaction)
        } else {
                decode_new_sigaction(tcp, tcp->u_arg[2]);
 #if defined(SPARC) || defined(SPARC64)
-               tprintf(", %#lx, %lu", tcp->u_arg[3], tcp->u_arg[4]);
+               tprintf(", %#" PRI_klx ", %" PRI_klu, tcp->u_arg[3], tcp->u_arg[4]);
 #elif defined(ALPHA)
-               tprintf(", %lu, %#lx", tcp->u_arg[3], tcp->u_arg[4]);
+               tprintf(", %" PRI_klu ", %#" PRI_klx, tcp->u_arg[3], tcp->u_arg[4]);
 #else
-               tprintf(", %lu", tcp->u_arg[3]);
+               tprintf(", %" PRI_klu, tcp->u_arg[3]);
 #endif
        }
        return 0;
@@ -582,7 +582,7 @@ SYS_FUNC(rt_sigpending)
                 */
                print_sigset_addr_len_limit(tcp, tcp->u_arg[0],
                                            tcp->u_arg[1], 1);
-               tprintf(", %lu", tcp->u_arg[1]);
+               tprintf(", %" PRI_klu, tcp->u_arg[1]);
        }
        return 0;
 }
@@ -591,14 +591,14 @@ SYS_FUNC(rt_sigsuspend)
 {
        /* NB: kernel requires arg[1] == NSIG / 8 */
        print_sigset_addr_len(tcp, tcp->u_arg[0], tcp->u_arg[1]);
-       tprintf(", %lu", tcp->u_arg[1]);
+       tprintf(", %" PRI_klu, tcp->u_arg[1]);
 
        return RVAL_DECODED;
 }
 
 static void
 print_sigqueueinfo(struct tcb *const tcp, const int sig,
-                  const kernel_ureg_t addr)
+                  const kernel_ulong_t addr)
 {
        printsignal(sig);
        tprints(", ");
@@ -636,7 +636,7 @@ SYS_FUNC(rt_sigtimedwait)
                        printaddr(tcp->u_arg[1]);
                        tprints(", ");
                        print_timespec(tcp, tcp->u_arg[2]);
-                       tprintf(", %lu", tcp->u_arg[3]);
+                       tprintf(", %" PRI_klu, tcp->u_arg[3]);
                } else {
                        char *sts = xstrdup(sprint_timespec(tcp, tcp->u_arg[2]));
                        set_tcb_priv_data(tcp, sts, free);
@@ -646,7 +646,7 @@ SYS_FUNC(rt_sigtimedwait)
                        printsiginfo_at(tcp, tcp->u_arg[1]);
                        tprints(", ");
                        tprints(get_tcb_priv_data(tcp));
-                       tprintf(", %lu", tcp->u_arg[3]);
+                       tprintf(", %" PRI_klu, tcp->u_arg[3]);
                }
 
                if (!syserror(tcp) && tcp->u_rval) {