Remove linux/ptp_clock.h

[strace] / signal.c

diff --git a/signal.c b/signal.c
index 40e8accf2704f9e318054833e0aa6cf9c35cb8ae..b14124e98330bb822e60c4f508f02d55d4f12a59 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -289,8 +289,7 @@ SYS_FUNC(ssetmask)
 {
        if (entering(tcp)) {
                tprint_old_sigmask_val("", (unsigned) tcp->u_arg[0]);
-       }
-       else if (!syserror(tcp)) {
+       } else if (!syserror(tcp)) {
                tcp->auxstr = sprint_old_sigmask_val("old mask ",
                                                     (unsigned) tcp->u_rval);
                return RVAL_HEX | RVAL_STR;
@@ -350,7 +349,7 @@ decode_old_sigaction(struct tcb *const tcp, const kernel_ulong_t addr)
        tprints("{sa_handler=");
        print_sa_handler(sa.sa_handler__);
        tprints(", sa_mask=");
-       tprintsigmask_val("", sa.sa_mask);
+       tprint_old_sigmask_val("", sa.sa_mask);
        tprints(", sa_flags=");
        printflags(sigact_flags, sa.sa_flags, "SA_???");
 #if !(defined ALPHA || defined MIPS)
@@ -365,7 +364,14 @@ decode_old_sigaction(struct tcb *const tcp, const kernel_ulong_t addr)
 SYS_FUNC(sigaction)
 {
        if (entering(tcp)) {
-               printsignal(tcp->u_arg[0]);
+               int signo = tcp->u_arg[0];
+#if defined SPARC || defined SPARC64
+               if (signo < 0) {
+                       tprints("-");
+                       signo = -signo;
+               }
+#endif
+               printsignal(signo);
                tprints(", ");
                decode_old_sigaction(tcp, tcp->u_arg[1]);
                tprints(", ");
@@ -426,8 +432,7 @@ SYS_FUNC(osf_sigprocmask)
        if (entering(tcp)) {
                printxval(sigprocmaskcmds, tcp->u_arg[0], "SIG_???");
                tprintsigmask_val(", ", tcp->u_arg[1]);
-       }
-       else if (!syserror(tcp)) {
+       } else if (!syserror(tcp)) {
                tcp->auxstr = sprintsigmask_val("old mask ", tcp->u_rval);
                return RVAL_HEX | RVAL_STR;
        }
@@ -444,8 +449,7 @@ SYS_FUNC(sigprocmask)
                tprints(", ");
                print_sigset_addr_len(tcp, tcp->u_arg[1], current_wordsize);
                tprints(", ");
-       }
-       else {
+       } else {
                print_sigset_addr_len(tcp, tcp->u_arg[2], current_wordsize);
        }
        return 0;
@@ -486,8 +490,7 @@ SYS_FUNC(rt_sigprocmask)
                tprints(", ");
                print_sigset_addr_len(tcp, tcp->u_arg[1], tcp->u_arg[3]);
                tprints(", ");
-       }
-       else {
+       } else {
                print_sigset_addr_len(tcp, tcp->u_arg[2], tcp->u_arg[3]);
                tprintf(", %" PRI_klu, tcp->u_arg[3]);
        }
@@ -495,8 +498,7 @@ SYS_FUNC(rt_sigprocmask)
 }
 
 /* Structure describing the action to be taken when a signal arrives.  */
-struct new_sigaction
-{
+struct new_sigaction {
        /* sa_handler may be a libc #define, need to use other name: */
 #ifdef MIPS
        unsigned int sa_flags;
@@ -512,8 +514,7 @@ struct new_sigaction
        unsigned long sa_mask[NSIG / sizeof(long)];
 };
 /* Same for i386-on-x86_64 and similar cases */
-struct new_sigaction32
-{
+struct new_sigaction32 {
        uint32_t sa_handler__;
        uint32_t sa_flags;
 #if HAVE_SA_RESTORER