summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--nptl/tst-cleanup2.c11
2 files changed, 6 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index fa82cfa2df..bcd964b708 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2015-02-06 Roland McGrath <roland@hack.frob.com>
+ * nptl/tst-cleanup2.c (do_test): Use signal rather than sigaction.
+ Drop trailing \n from perror argument. Use return rather than exit.
+
* nptl/tst-cancel20.c (do_test): Conditionalize SA_SIGINFO-using tests
on [SA_SIGINFO].
* nptl/tst-cancel21.c (do_test): Likewise.
diff --git a/nptl/tst-cleanup2.c b/nptl/tst-cleanup2.c
index 8a524de869..9e5a9570a4 100644
--- a/nptl/tst-cleanup2.c
+++ b/nptl/tst-cleanup2.c
@@ -40,16 +40,11 @@ do_test (void)
array. Mark the return value as volatile so that it gets reloaded on
return. */
volatile int ret = 0;
- struct sigaction sa;
- sa.sa_handler = sig_handler;
- sigemptyset (&sa.sa_mask);
- sa.sa_flags = SA_SIGINFO;
-
- if (sigaction (SIGSEGV, &sa, 0))
+ if (signal (SIGSEGV, &sig_handler) == SIG_ERR)
{
- perror ("installing SIGSEGV handler\n");
- exit (1);
+ perror ("installing SIGSEGV handler");
+ return 1;
}
puts ("Attempting to sprintf to null ptr");