From: Daiki Ueno <ueno@gnu.org>
Date: Sun, 4 Oct 2020 12:08:37 +0000 (+0200)
Subject: src: remove use of siginterrupt
X-Git-Tag: 3.7.0~17^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e65eebb6e324bea9ef6c73c758c8b9462d7f878;p=thirdparty%2Fgnutls.git

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>
---

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)