[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libmicrohttpd] 03/05: test and examples: check socket control functions
From: |
gnunet |
Subject: |
[libmicrohttpd] 03/05: test and examples: check socket control functions results |
Date: |
Sun, 21 Nov 2021 13:44:30 +0100 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
commit 87ab1ec7f7e4f31c95fedfdfffa5a940e9d1bcdc
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Wed Nov 17 15:08:32 2021 +0300
test and examples: check socket control functions results
---
doc/examples/websocket.c | 9 +++++----
src/examples/upgrade_example.c | 6 +++---
src/examples/websocket_chatserver_example.c | 6 +++---
src/examples/websocket_threaded_example.c | 5 +++--
src/microhttpd/test_upgrade.c | 5 +++--
src/microhttpd/test_upgrade_large.c | 5 +++--
6 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/doc/examples/websocket.c b/doc/examples/websocket.c
index fad1e95f..4fa6f4ed 100644
--- a/doc/examples/websocket.c
+++ b/doc/examples/websocket.c
@@ -286,15 +286,16 @@ make_blocking (MHD_socket fd)
flags = fcntl (fd, F_GETFL);
if (-1 == flags)
- return;
+ abort ();
if ((flags & ~O_NONBLOCK) != flags)
if (-1 == fcntl (fd, F_SETFL, flags & ~O_NONBLOCK))
abort ();
-#else
+#else /* _WIN32 */
unsigned long flags = 0;
- ioctlsocket (fd, FIONBIO, &flags);
-#endif
+ if (0 != ioctlsocket (fd, (int) FIONBIO, &flags))
+ abort ();
+#endif /* _WIN32 */
}
diff --git a/src/examples/upgrade_example.c b/src/examples/upgrade_example.c
index b63d8802..93a2a72c 100644
--- a/src/examples/upgrade_example.c
+++ b/src/examples/upgrade_example.c
@@ -50,16 +50,16 @@ make_blocking (MHD_socket fd)
flags = fcntl (fd, F_GETFL);
if (-1 == flags)
- return;
+ abort ();
if ((flags & ~O_NONBLOCK) != flags)
if (-1 == fcntl (fd, F_SETFL, flags & ~O_NONBLOCK))
abort ();
#elif defined(MHD_WINSOCK_SOCKETS)
unsigned long flags = 0;
- ioctlsocket (fd, (int) FIONBIO, &flags);
+ if (0 != ioctlsocket (fd, (int) FIONBIO, &flags))
+ abort ();
#endif /* MHD_WINSOCK_SOCKETS */
-
}
diff --git a/src/examples/websocket_chatserver_example.c
b/src/examples/websocket_chatserver_example.c
index eb5dad39..70ad6cae 100644
--- a/src/examples/websocket_chatserver_example.c
+++ b/src/examples/websocket_chatserver_example.c
@@ -707,16 +707,16 @@ make_blocking (MHD_socket fd)
flags = fcntl (fd, F_GETFL);
if (-1 == flags)
- return;
+ abort ();
if ((flags & ~O_NONBLOCK) != flags)
if (-1 == fcntl (fd, F_SETFL, flags & ~O_NONBLOCK))
abort ();
#elif defined(MHD_WINSOCK_SOCKETS)
unsigned long flags = 0;
- ioctlsocket (fd, FIONBIO, &flags);
+ if (0 != ioctlsocket (fd, (int) FIONBIO, &flags))
+ abort ();
#endif /* MHD_WINSOCK_SOCKETS */
-
}
diff --git a/src/examples/websocket_threaded_example.c
b/src/examples/websocket_threaded_example.c
index 8680823f..3a232b41 100644
--- a/src/examples/websocket_threaded_example.c
+++ b/src/examples/websocket_threaded_example.c
@@ -519,14 +519,15 @@ make_blocking (MHD_socket fd)
flags = fcntl (fd, F_GETFL);
if (-1 == flags)
- return;
+ abort ();
if ((flags & ~O_NONBLOCK) != flags)
if (-1 == fcntl (fd, F_SETFL, flags & ~O_NONBLOCK))
abort ();
#elif defined(MHD_WINSOCK_SOCKETS)
unsigned long flags = 0;
- ioctlsocket (fd, (int) FIONBIO, &flags);
+ if (0 != ioctlsocket (fd, (int) FIONBIO, &flags))
+ abort ();
#endif /* MHD_WINSOCK_SOCKETS */
}
diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c
index b691bcda..873b832a 100644
--- a/src/microhttpd/test_upgrade.c
+++ b/src/microhttpd/test_upgrade.c
@@ -564,14 +564,15 @@ make_blocking (MHD_socket fd)
flags = fcntl (fd, F_GETFL);
if (-1 == flags)
- return;
+ abort ();
if ((flags & ~O_NONBLOCK) != flags)
if (-1 == fcntl (fd, F_SETFL, flags & ~O_NONBLOCK))
abort ();
#elif defined(MHD_WINSOCK_SOCKETS)
unsigned long flags = 0;
- ioctlsocket (fd, (int) FIONBIO, &flags);
+ if (0 != ioctlsocket (fd, (int) FIONBIO, &flags))
+ abort ();
#endif /* MHD_WINSOCK_SOCKETS */
}
diff --git a/src/microhttpd/test_upgrade_large.c
b/src/microhttpd/test_upgrade_large.c
index 6bbaf04d..e080266c 100644
--- a/src/microhttpd/test_upgrade_large.c
+++ b/src/microhttpd/test_upgrade_large.c
@@ -738,14 +738,15 @@ make_blocking (MHD_socket fd)
flags = fcntl (fd, F_GETFL);
if (-1 == flags)
- return;
+ abort ();
if ((flags & ~O_NONBLOCK) != flags)
if (-1 == fcntl (fd, F_SETFL, flags & ~O_NONBLOCK))
abort ();
#elif defined(MHD_WINSOCK_SOCKETS)
unsigned long flags = 0;
- ioctlsocket (fd, (int) FIONBIO, &flags);
+ if (0 != ioctlsocket (fd, (int) FIONBIO, &flags))
+ abort ();
#endif /* MHD_WINSOCK_SOCKETS */
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.