aboutsummaryrefslogtreecommitdiff
path: root/src/microhttpd/test_shutdown_select.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/microhttpd/test_shutdown_select.c')
-rw-r--r--src/microhttpd/test_shutdown_select.c28
1 files changed, 10 insertions, 18 deletions
diff --git a/src/microhttpd/test_shutdown_select.c b/src/microhttpd/test_shutdown_select.c
index 63c0c53c..96e045bf 100644
--- a/src/microhttpd/test_shutdown_select.c
+++ b/src/microhttpd/test_shutdown_select.c
@@ -90,14 +90,6 @@
90static _MHD_bool check_err; 90static _MHD_bool check_err;
91 91
92 92
93void
94MHD_PANIC (char *msg)
95{
96 fprintf (stderr, "%s", msg);
97 abort ();
98}
99
100
101static _MHD_bool 93static _MHD_bool
102has_in_name(const char *prog_name, const char *marker) 94has_in_name(const char *prog_name, const char *marker)
103{ 95{
@@ -189,7 +181,7 @@ start_socket_listen(int domain)
189 { 181 {
190 fprintf (stderr, "Failed to bind socket: %u\n", 182 fprintf (stderr, "Failed to bind socket: %u\n",
191 (unsigned)sock_errno); 183 (unsigned)sock_errno);
192 MHD_socket_close_ (fd); 184 MHD_socket_close_chk_ (fd);
193 return MHD_INVALID_SOCKET; 185 return MHD_INVALID_SOCKET;
194 } 186 }
195 187
@@ -198,7 +190,7 @@ start_socket_listen(int domain)
198 { 190 {
199 fprintf (stderr, "Failed to make socket non-blocking: %u\n", 191 fprintf (stderr, "Failed to make socket non-blocking: %u\n",
200 (unsigned)sock_errno); 192 (unsigned)sock_errno);
201 MHD_socket_close_ (fd); 193 MHD_socket_close_chk_ (fd);
202 return MHD_INVALID_SOCKET; 194 return MHD_INVALID_SOCKET;
203 } 195 }
204#else /* MHD_POSIX_SOCKETS */ 196#else /* MHD_POSIX_SOCKETS */
@@ -209,7 +201,7 @@ start_socket_listen(int domain)
209 { 201 {
210 fprintf (stderr, "Failed to make socket non-blocking: %s\n", 202 fprintf (stderr, "Failed to make socket non-blocking: %s\n",
211 MHD_socket_last_strerr_ ()); 203 MHD_socket_last_strerr_ ());
212 MHD_socket_close_ (fd); 204 MHD_socket_close_chk_ (fd);
213 return MHD_INVALID_SOCKET; 205 return MHD_INVALID_SOCKET;
214 } 206 }
215#endif /* MHD_POSIX_SOCKETS */ 207#endif /* MHD_POSIX_SOCKETS */
@@ -218,7 +210,7 @@ start_socket_listen(int domain)
218 { 210 {
219 fprintf (stderr, "Failed to listen on socket: %u\n", 211 fprintf (stderr, "Failed to listen on socket: %u\n",
220 (unsigned)sock_errno); 212 (unsigned)sock_errno);
221 MHD_socket_close_ (fd); 213 MHD_socket_close_chk_ (fd);
222 return MHD_INVALID_SOCKET; 214 return MHD_INVALID_SOCKET;
223 } 215 }
224 216
@@ -334,7 +326,7 @@ main (int argc, char *const *argv)
334#if defined(MHD_USE_POSIX_THREADS) 326#if defined(MHD_USE_POSIX_THREADS)
335 if (0 != pthread_create (&sel_thrd, NULL, test_func, &listen_socket)) 327 if (0 != pthread_create (&sel_thrd, NULL, test_func, &listen_socket))
336 { 328 {
337 MHD_socket_close_ (listen_socket); 329 MHD_socket_close_chk_ (listen_socket);
338 fprintf (stderr, "Can't start thread\n"); 330 fprintf (stderr, "Can't start thread\n");
339 return 99; 331 return 99;
340 } 332 }
@@ -342,7 +334,7 @@ main (int argc, char *const *argv)
342 sel_thrd = (HANDLE)_beginthreadex (NULL, 0, test_func, &listen_socket, 0, NULL); 334 sel_thrd = (HANDLE)_beginthreadex (NULL, 0, test_func, &listen_socket, 0, NULL);
343 if (0 == (sel_thrd)) 335 if (0 == (sel_thrd))
344 { 336 {
345 MHD_socket_close_ (listen_socket); 337 MHD_socket_close_chk_ (listen_socket);
346 fprintf (stderr, "Can't start select() thread\n"); 338 fprintf (stderr, "Can't start select() thread\n");
347 return 99; 339 return 99;
348 } 340 }
@@ -359,23 +351,23 @@ main (int argc, char *const *argv)
359 /* fprintf (stdout, "Waiting for thread to finish...\n"); */ 351 /* fprintf (stdout, "Waiting for thread to finish...\n"); */
360 if (!MHD_join_thread_(sel_thrd)) 352 if (!MHD_join_thread_(sel_thrd))
361 { 353 {
362 MHD_socket_close_(listen_socket); 354 MHD_socket_close_chk_(listen_socket);
363 fprintf (stderr, "Can't join select() thread\n"); 355 fprintf (stderr, "Can't join select() thread\n");
364 return 99; 356 return 99;
365 } 357 }
366 if (check_err) 358 if (check_err)
367 { 359 {
368 MHD_socket_close_(listen_socket); 360 MHD_socket_close_chk_(listen_socket);
369 fprintf (stderr, "Error in waiting thread\n"); 361 fprintf (stderr, "Error in waiting thread\n");
370 return 99; 362 return 99;
371 } 363 }
372 end_t = time (NULL); 364 end_t = time (NULL);
373 /* fprintf (stdout, "Thread finished.\n"); */ 365 /* fprintf (stdout, "Thread finished.\n"); */
374 MHD_socket_close_(listen_socket); 366 MHD_socket_close_chk_(listen_socket);
375 367
376 if (start_t == (time_t)-1 || end_t == (time_t)-1) 368 if (start_t == (time_t)-1 || end_t == (time_t)-1)
377 { 369 {
378 MHD_socket_close_(listen_socket); 370 MHD_socket_close_chk_(listen_socket);
379 fprintf (stderr, "Can't get current time\n"); 371 fprintf (stderr, "Can't get current time\n");
380 return 99; 372 return 99;
381 } 373 }