X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=print_sigevent.c;h=2729810392e8ea4ea6a7bb4228f0a0013445930e;hb=73fa3d68228f27b7dbeb34d73a3b8bc564a8aef9;hp=f8eb8a0f4765bec2e8cb0007bf378875fcd9ca76;hpb=e714b87064ca296bcfbc1f8ade9e99773e9dc813;p=strace

diff --git a/print_sigevent.c b/print_sigevent.c
index f8eb8a0f..27298103 100644
--- a/print_sigevent.c
+++ b/print_sigevent.c
@@ -1,29 +1,9 @@
 /*
  * Copyright (c) 2003, 2004 Ulrich Drepper <drepper@redhat.com>
- * Copyright (c) 2005-2016 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2005-2018 Dmitry V. Levin <ldv@altlinux.org>
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
 #include "defs.h"
@@ -35,7 +15,8 @@
 #include <signal.h>
 #include "xlat/sigev_value.h"
 
-MPERS_PRINTER_DECL(void, print_sigevent)(struct tcb *tcp, const long addr)
+MPERS_PRINTER_DECL(void, print_sigevent,
+		   struct tcb *const tcp, const kernel_ulong_t addr)
 {
 	struct_sigevent sev;
 
@@ -43,17 +24,19 @@ MPERS_PRINTER_DECL(void, print_sigevent)(struct tcb *tcp, const long addr)
 		return;
 
 	tprints("{");
-	if (sev.sigev_value.sival_ptr)
-		tprintf("sigev_value={int=%d, ptr=%#lx}, ",
-			sev.sigev_value.sival_int,
-			(unsigned long) sev.sigev_value.sival_ptr);
+	if (sev.sigev_value.sival_ptr) {
+		tprintf("sigev_value={sival_int=%d, sival_ptr=",
+			sev.sigev_value.sival_int);
+		printaddr(sev.sigev_value.sival_ptr);
+		tprints("}, ");
+	}
 
 	tprints("sigev_signo=");
 	switch (sev.sigev_notify) {
 	case SIGEV_SIGNAL:
 	case SIGEV_THREAD:
 	case SIGEV_THREAD_ID:
-		tprints(signame(sev.sigev_signo));
+		printsignal(sev.sigev_signo);
 		break;
 	default:
 		tprintf("%u", sev.sigev_signo);