diff options
Diffstat (limited to 'src/testcurl/test_get_empty.c')
-rw-r--r-- | src/testcurl/test_get_empty.c | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/src/testcurl/test_get_empty.c b/src/testcurl/test_get_empty.c index 32d6b16f..1dd4500d 100644 --- a/src/testcurl/test_get_empty.c +++ b/src/testcurl/test_get_empty.c | |||
@@ -58,7 +58,7 @@ | |||
58 | #endif | 58 | #endif |
59 | 59 | ||
60 | static int oneone; | 60 | static int oneone; |
61 | static int global_port; | 61 | static uint16_t global_port; |
62 | 62 | ||
63 | struct CBC | 63 | struct CBC |
64 | { | 64 | { |
@@ -139,8 +139,8 @@ ahc_echo (void *cls, | |||
139 | } | 139 | } |
140 | 140 | ||
141 | 141 | ||
142 | static int | 142 | static unsigned int |
143 | testInternalGet (int poll_flag) | 143 | testInternalGet (uint32_t poll_flag) |
144 | { | 144 | { |
145 | struct MHD_Daemon *d; | 145 | struct MHD_Daemon *d; |
146 | CURL *c; | 146 | CURL *c; |
@@ -160,7 +160,7 @@ testInternalGet (int poll_flag) | |||
160 | cbc.size = 2048; | 160 | cbc.size = 2048; |
161 | cbc.pos = 0; | 161 | cbc.pos = 0; |
162 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 162 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
163 | | poll_flag, | 163 | | (enum MHD_FLAG) poll_flag, |
164 | global_port, NULL, NULL, | 164 | global_port, NULL, NULL, |
165 | &ahc_echo, "GET", | 165 | &ahc_echo, "GET", |
166 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, | 166 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, |
@@ -175,7 +175,7 @@ testInternalGet (int poll_flag) | |||
175 | { | 175 | { |
176 | MHD_stop_daemon (d); return 32; | 176 | MHD_stop_daemon (d); return 32; |
177 | } | 177 | } |
178 | global_port = (int) dinfo->port; | 178 | global_port = dinfo->port; |
179 | } | 179 | } |
180 | c = curl_easy_init (); | 180 | c = curl_easy_init (); |
181 | curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1" EXPECTED_URI_PATH); | 181 | curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1" EXPECTED_URI_PATH); |
@@ -210,8 +210,8 @@ testInternalGet (int poll_flag) | |||
210 | } | 210 | } |
211 | 211 | ||
212 | 212 | ||
213 | static int | 213 | static unsigned int |
214 | testMultithreadedGet (int poll_flag) | 214 | testMultithreadedGet (uint32_t poll_flag) |
215 | { | 215 | { |
216 | struct MHD_Daemon *d; | 216 | struct MHD_Daemon *d; |
217 | CURL *c; | 217 | CURL *c; |
@@ -232,7 +232,7 @@ testMultithreadedGet (int poll_flag) | |||
232 | cbc.pos = 0; | 232 | cbc.pos = 0; |
233 | d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | 233 | d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
234 | | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 234 | | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
235 | | poll_flag, | 235 | | (enum MHD_FLAG) poll_flag, |
236 | global_port, NULL, NULL, | 236 | global_port, NULL, NULL, |
237 | &ahc_echo, "GET", | 237 | &ahc_echo, "GET", |
238 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, | 238 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, |
@@ -247,7 +247,7 @@ testMultithreadedGet (int poll_flag) | |||
247 | { | 247 | { |
248 | MHD_stop_daemon (d); return 32; | 248 | MHD_stop_daemon (d); return 32; |
249 | } | 249 | } |
250 | global_port = (int) dinfo->port; | 250 | global_port = dinfo->port; |
251 | } | 251 | } |
252 | c = curl_easy_init (); | 252 | c = curl_easy_init (); |
253 | curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1" EXPECTED_URI_PATH); | 253 | curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1" EXPECTED_URI_PATH); |
@@ -282,8 +282,8 @@ testMultithreadedGet (int poll_flag) | |||
282 | } | 282 | } |
283 | 283 | ||
284 | 284 | ||
285 | static int | 285 | static unsigned int |
286 | testMultithreadedPoolGet (int poll_flag) | 286 | testMultithreadedPoolGet (uint32_t poll_flag) |
287 | { | 287 | { |
288 | struct MHD_Daemon *d; | 288 | struct MHD_Daemon *d; |
289 | CURL *c; | 289 | CURL *c; |
@@ -303,7 +303,7 @@ testMultithreadedPoolGet (int poll_flag) | |||
303 | cbc.size = 2048; | 303 | cbc.size = 2048; |
304 | cbc.pos = 0; | 304 | cbc.pos = 0; |
305 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 305 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
306 | | poll_flag, | 306 | | (enum MHD_FLAG) poll_flag, |
307 | global_port, NULL, NULL, | 307 | global_port, NULL, NULL, |
308 | &ahc_echo, "GET", | 308 | &ahc_echo, "GET", |
309 | MHD_OPTION_THREAD_POOL_SIZE, MHD_CPU_COUNT, | 309 | MHD_OPTION_THREAD_POOL_SIZE, MHD_CPU_COUNT, |
@@ -319,7 +319,7 @@ testMultithreadedPoolGet (int poll_flag) | |||
319 | { | 319 | { |
320 | MHD_stop_daemon (d); return 32; | 320 | MHD_stop_daemon (d); return 32; |
321 | } | 321 | } |
322 | global_port = (int) dinfo->port; | 322 | global_port = dinfo->port; |
323 | } | 323 | } |
324 | c = curl_easy_init (); | 324 | c = curl_easy_init (); |
325 | curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1" EXPECTED_URI_PATH); | 325 | curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1" EXPECTED_URI_PATH); |
@@ -354,7 +354,7 @@ testMultithreadedPoolGet (int poll_flag) | |||
354 | } | 354 | } |
355 | 355 | ||
356 | 356 | ||
357 | static int | 357 | static unsigned int |
358 | testExternalGet () | 358 | testExternalGet () |
359 | { | 359 | { |
360 | struct MHD_Daemon *d; | 360 | struct MHD_Daemon *d; |
@@ -400,7 +400,7 @@ testExternalGet () | |||
400 | { | 400 | { |
401 | MHD_stop_daemon (d); return 32; | 401 | MHD_stop_daemon (d); return 32; |
402 | } | 402 | } |
403 | global_port = (int) dinfo->port; | 403 | global_port = dinfo->port; |
404 | } | 404 | } |
405 | c = curl_easy_init (); | 405 | c = curl_easy_init (); |
406 | curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1" EXPECTED_URI_PATH); | 406 | curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1" EXPECTED_URI_PATH); |
@@ -537,8 +537,8 @@ testExternalGet () | |||
537 | } | 537 | } |
538 | 538 | ||
539 | 539 | ||
540 | static int | 540 | static unsigned int |
541 | testUnknownPortGet (int poll_flag) | 541 | testUnknownPortGet (uint32_t poll_flag) |
542 | { | 542 | { |
543 | struct MHD_Daemon *d; | 543 | struct MHD_Daemon *d; |
544 | const union MHD_DaemonInfo *di; | 544 | const union MHD_DaemonInfo *di; |
@@ -546,7 +546,7 @@ testUnknownPortGet (int poll_flag) | |||
546 | char buf[2048]; | 546 | char buf[2048]; |
547 | struct CBC cbc; | 547 | struct CBC cbc; |
548 | CURLcode errornum; | 548 | CURLcode errornum; |
549 | int port; | 549 | uint16_t port; |
550 | 550 | ||
551 | struct sockaddr_in addr; | 551 | struct sockaddr_in addr; |
552 | socklen_t addr_len = sizeof(addr); | 552 | socklen_t addr_len = sizeof(addr); |
@@ -559,7 +559,7 @@ testUnknownPortGet (int poll_flag) | |||
559 | cbc.size = 2048; | 559 | cbc.size = 2048; |
560 | cbc.pos = 0; | 560 | cbc.pos = 0; |
561 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 561 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
562 | | poll_flag, | 562 | | (enum MHD_FLAG) poll_flag, |
563 | 0, NULL, NULL, &ahc_echo, "GET", | 563 | 0, NULL, NULL, &ahc_echo, "GET", |
564 | MHD_OPTION_SOCK_ADDR, &addr, | 564 | MHD_OPTION_SOCK_ADDR, &addr, |
565 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, | 565 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, |
@@ -575,7 +575,7 @@ testUnknownPortGet (int poll_flag) | |||
575 | 575 | ||
576 | if (addr.sin_family != AF_INET) | 576 | if (addr.sin_family != AF_INET) |
577 | return 26214; | 577 | return 26214; |
578 | port = (int) ntohs (addr.sin_port); | 578 | port = ntohs (addr.sin_port); |
579 | } | 579 | } |
580 | else | 580 | else |
581 | { | 581 | { |
@@ -585,13 +585,13 @@ testUnknownPortGet (int poll_flag) | |||
585 | { | 585 | { |
586 | MHD_stop_daemon (d); return 32; | 586 | MHD_stop_daemon (d); return 32; |
587 | } | 587 | } |
588 | port = (int) dinfo->port; | 588 | port = dinfo->port; |
589 | } | 589 | } |
590 | 590 | ||
591 | snprintf (buf, | 591 | snprintf (buf, |
592 | sizeof(buf), | 592 | sizeof(buf), |
593 | "http://127.0.0.1:%d%s", | 593 | "http://127.0.0.1:%u%s", |
594 | port, | 594 | (unsigned int) port, |
595 | EXPECTED_URI_PATH); | 595 | EXPECTED_URI_PATH); |
596 | 596 | ||
597 | c = curl_easy_init (); | 597 | c = curl_easy_init (); |
@@ -626,8 +626,8 @@ testUnknownPortGet (int poll_flag) | |||
626 | } | 626 | } |
627 | 627 | ||
628 | 628 | ||
629 | static int | 629 | static unsigned int |
630 | testStopRace (int poll_flag) | 630 | testStopRace (uint32_t poll_flag) |
631 | { | 631 | { |
632 | struct sockaddr_in sin; | 632 | struct sockaddr_in sin; |
633 | MHD_socket fd; | 633 | MHD_socket fd; |
@@ -643,7 +643,7 @@ testStopRace (int poll_flag) | |||
643 | 643 | ||
644 | d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | 644 | d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
645 | | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 645 | | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
646 | | poll_flag, | 646 | | (enum MHD_FLAG) poll_flag, |
647 | global_port, NULL, NULL, | 647 | global_port, NULL, NULL, |
648 | &ahc_echo, "GET", | 648 | &ahc_echo, "GET", |
649 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, | 649 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, |
@@ -658,7 +658,7 @@ testStopRace (int poll_flag) | |||
658 | { | 658 | { |
659 | MHD_stop_daemon (d); return 32; | 659 | MHD_stop_daemon (d); return 32; |
660 | } | 660 | } |
661 | global_port = (int) dinfo->port; | 661 | global_port = dinfo->port; |
662 | } | 662 | } |
663 | 663 | ||
664 | fd = socket (PF_INET, SOCK_STREAM, 0); | 664 | fd = socket (PF_INET, SOCK_STREAM, 0); |
@@ -749,8 +749,8 @@ curlExcessFound (CURL *c, curl_infotype type, char *data, size_t size, | |||
749 | } | 749 | } |
750 | 750 | ||
751 | 751 | ||
752 | static int | 752 | static unsigned int |
753 | testEmptyGet (int poll_flag) | 753 | testEmptyGet (uint32_t poll_flag) |
754 | { | 754 | { |
755 | struct MHD_Daemon *d; | 755 | struct MHD_Daemon *d; |
756 | CURL *c; | 756 | CURL *c; |
@@ -771,7 +771,7 @@ testEmptyGet (int poll_flag) | |||
771 | cbc.size = 2048; | 771 | cbc.size = 2048; |
772 | cbc.pos = 0; | 772 | cbc.pos = 0; |
773 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 773 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
774 | | poll_flag, | 774 | | (enum MHD_FLAG) poll_flag, |
775 | global_port, NULL, NULL, | 775 | global_port, NULL, NULL, |
776 | &ahc_empty, NULL, | 776 | &ahc_empty, NULL, |
777 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, | 777 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, |
@@ -786,7 +786,7 @@ testEmptyGet (int poll_flag) | |||
786 | { | 786 | { |
787 | MHD_stop_daemon (d); return 32; | 787 | MHD_stop_daemon (d); return 32; |
788 | } | 788 | } |
789 | global_port = (int) dinfo->port; | 789 | global_port = dinfo->port; |
790 | } | 790 | } |
791 | c = curl_easy_init (); | 791 | c = curl_easy_init (); |
792 | curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1" EXPECTED_URI_PATH); | 792 | curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1" EXPECTED_URI_PATH); |