summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRolf Eike Beer <eike@sf-mail.de>2018-06-26 15:18:36 +0200
committerRolf Eike Beer <eike@sf-mail.de>2018-06-26 15:18:36 +0200
commit9aa4bbdb885c5b5ab7c29ee598d0e6df14df1141 (patch)
treef41fbba1c9e30d1f3336864823ed73e43da3a064
parent8c405696b8f136eaea32b55e99ccdcae134662f7 (diff)
downloadgnutls-9aa4bbdb885c5b5ab7c29ee598d0e6df14df1141.tar.gz
convert from milliseconds to timespec without loop
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
-rw-r--r--doc/examples/ex-serv-dtls.c9
-rw-r--r--src/common.h8
-rw-r--r--src/udp-serv.c9
-rw-r--r--tests/mini-dtls-mtu.c9
4 files changed, 8 insertions, 27 deletions
diff --git a/doc/examples/ex-serv-dtls.c b/doc/examples/ex-serv-dtls.c
index 887b4b83df..23b51a1781 100644
--- a/doc/examples/ex-serv-dtls.c
+++ b/doc/examples/ex-serv-dtls.c
@@ -303,13 +303,8 @@ static int pull_timeout_func(gnutls_transport_ptr_t ptr, unsigned int ms)
FD_ZERO(&rfds);
FD_SET(priv->fd, &rfds);
- tv.tv_sec = 0;
- tv.tv_usec = ms * 1000;
-
- while (tv.tv_usec >= 1000000) {
- tv.tv_usec -= 1000000;
- tv.tv_sec++;
- }
+ tv.tv_sec = ms / 1000;
+ tv.tv_usec = (ms % 1000) * 1000;
ret = select(priv->fd + 1, &rfds, NULL, NULL, &tv);
diff --git a/src/common.h b/src/common.h
index f1c828ce40..20faf7d521 100644
--- a/src/common.h
+++ b/src/common.h
@@ -101,12 +101,8 @@ static int system_recv_timeout(gnutls_transport_ptr_t ptr, unsigned int ms)
FD_ZERO(&rfds);
FD_SET(fd, &rfds);
- tv.tv_sec = 0;
- tv.tv_usec = ms * 1000;
- while (tv.tv_usec >= 1000000) {
- tv.tv_usec -= 1000000;
- tv.tv_sec++;
- }
+ tv.tv_sec = ms / 1000;
+ tv.tv_usec = (ms % 1000) * 1000;
return select(fd + 1, &rfds, NULL, NULL, &tv);
}
diff --git a/src/udp-serv.c b/src/udp-serv.c
index 5442946165..46e1e70878 100644
--- a/src/udp-serv.c
+++ b/src/udp-serv.c
@@ -239,13 +239,8 @@ static int pull_timeout_func(gnutls_transport_ptr_t ptr, unsigned int ms)
FD_ZERO(&rfds);
FD_SET(priv->fd, &rfds);
- tv.tv_sec = 0;
- tv.tv_usec = ms * 1000;
-
- while (tv.tv_usec >= 1000000) {
- tv.tv_usec -= 1000000;
- tv.tv_sec++;
- }
+ tv.tv_sec = ms / 1000;
+ tv.tv_usec = (ms % 1000) * 1000;
ret = select(priv->fd + 1, &rfds, NULL, NULL, &tv);
diff --git a/tests/mini-dtls-mtu.c b/tests/mini-dtls-mtu.c
index 82106081d6..1ae7325665 100644
--- a/tests/mini-dtls-mtu.c
+++ b/tests/mini-dtls-mtu.c
@@ -103,13 +103,8 @@ static int client_pull_timeout(gnutls_transport_ptr_t ptr, unsigned int ms)
FD_ZERO(&rfds);
FD_SET(fd, &rfds);
- tv.tv_sec = 0;
- tv.tv_usec = ms * 1000;
-
- while (tv.tv_usec >= 1000000) {
- tv.tv_usec -= 1000000;
- tv.tv_sec++;
- }
+ tv.tv_sec = (ms / 1000);
+ tv.tv_usec = (ms % 1000) * 1000;
ret = select(fd + 1, &rfds, NULL, NULL, &tv);
if (ret <= 0)