Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Use signal rather than sigaction in nptl/tst-cleanup2.
  • Loading branch information
Roland McGrath committed Feb 6, 2015
1 parent cfa69b0 commit 62ad2ab
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
3 changes: 3 additions & 0 deletions 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.
Expand Down
11 changes: 3 additions & 8 deletions nptl/tst-cleanup2.c
Expand Up @@ -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");
Expand Down

0 comments on commit 62ad2ab

Please sign in to comment.