summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@gnu.org>2020-10-04 14:08:37 +0200
committerDaiki Ueno <ueno@gnu.org>2020-11-04 08:55:00 +0100
commit4e65eebb6e324bea9ef6c73c758c8b9462d7f878 (patch)
treec6e43728899043f1b356af370869da6fd26b9420
parent6945473c489ec5bac8e27aa1f056fef5a99087cf (diff)
downloadgnutls-4e65eebb6e324bea9ef6c73c758c8b9462d7f878.tar.gz
src: remove use of siginterrupt
GCC 10 warns this: tests.c:702:2: error: 'siginterrupt' is deprecated: Use sigaction with SA_RESTART instead [-Werror=deprecated-declarations] Signed-off-by: Daiki Ueno <ueno@gnu.org>
-rw-r--r--src/tests.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/tests.c b/src/tests.c
index 76b896b8fd..067531bd8e 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -678,7 +678,7 @@ test_code_t test_bye(gnutls_session_t session)
char data[20];
int secs = 6;
#ifndef _WIN32
- int old;
+ struct sigaction sa, old_sa;
signal(SIGALRM, got_alarm);
#endif
@@ -699,7 +699,9 @@ test_code_t test_bye(gnutls_session_t session)
return TEST_FAILED;
#ifndef _WIN32
- old = siginterrupt(SIGALRM, 1);
+ (void) sigaction (SIGALRM, NULL, &sa);
+ sa.sa_flags &= ~SA_RESTART;
+ sigaction(SIGALRM, &sa, &old_sa);
alarm(secs);
#else
setsockopt((int) gnutls_transport_get_ptr(session), SOL_SOCKET,
@@ -712,7 +714,7 @@ test_code_t test_bye(gnutls_session_t session)
while (ret > 0);
#ifndef _WIN32
- siginterrupt(SIGALRM, old);
+ sigaction(SIGALRM, &old_sa, NULL);
#else
if (WSAGetLastError() == WSAETIMEDOUT ||
WSAGetLastError() == WSAECONNABORTED)