diff options
Diffstat (limited to 'src/testcurl/https/tls_test_common.c')
-rw-r--r-- | src/testcurl/https/tls_test_common.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/testcurl/https/tls_test_common.c b/src/testcurl/https/tls_test_common.c index f27813a2..da62b267 100644 --- a/src/testcurl/https/tls_test_common.c +++ b/src/testcurl/https/tls_test_common.c | |||
@@ -55,9 +55,9 @@ test_daemon_get (void *cls, | |||
55 | cbc.pos = 0; | 55 | cbc.pos = 0; |
56 | 56 | ||
57 | /* construct url - this might use doc_path */ | 57 | /* construct url - this might use doc_path */ |
58 | gen_test_file_url (url, | 58 | gen_test_uri (url, |
59 | sizeof (url), | 59 | sizeof (url), |
60 | port); | 60 | port); |
61 | 61 | ||
62 | c = curl_easy_init (); | 62 | c = curl_easy_init (); |
63 | #ifdef _DEBUG | 63 | #ifdef _DEBUG |
@@ -308,27 +308,27 @@ send_curl_req (char *url, | |||
308 | 308 | ||
309 | 309 | ||
310 | /** | 310 | /** |
311 | * compile test file url pointing to the current running directory path | 311 | * compile test URI |
312 | * | 312 | * |
313 | * @param[out] url - char buffer into which the url is compiled | 313 | * @param[out] uri - char buffer into which the url is compiled |
314 | * @param url_len number of bytes available in url | 314 | * @param uri_len number of bytes available in @a url |
315 | * @param port port to use for the test | 315 | * @param port port to use for the test |
316 | * @return 1 on error | 316 | * @return 1 on error |
317 | */ | 317 | */ |
318 | unsigned int | 318 | unsigned int |
319 | gen_test_file_url (char *url, | 319 | gen_test_uri (char *uri, |
320 | size_t url_len, | 320 | size_t uri_len, |
321 | uint16_t port) | 321 | uint16_t port) |
322 | { | 322 | { |
323 | int res; | 323 | int res; |
324 | 324 | ||
325 | res = snprintf (url, | 325 | res = snprintf (uri, |
326 | url_len, | 326 | uri_len, |
327 | "https://127.0.0.1:%u/urlpath", | 327 | "https://127.0.0.1:%u/urlpath", |
328 | (unsigned int) port); | 328 | (unsigned int) port); |
329 | if (res <= 0) | 329 | if (res <= 0) |
330 | return 1; | 330 | return 1; |
331 | if ((size_t) res >= url_len) | 331 | if ((size_t) res >= uri_len) |
332 | return 1; | 332 | return 1; |
333 | 333 | ||
334 | return 0; | 334 | return 0; |
@@ -359,9 +359,9 @@ test_https_transfer (void *cls, | |||
359 | cbc.size = len; | 359 | cbc.size = len; |
360 | cbc.pos = 0; | 360 | cbc.pos = 0; |
361 | 361 | ||
362 | if (gen_test_file_url (url, | 362 | if (gen_test_uri (url, |
363 | sizeof (url), | 363 | sizeof (url), |
364 | port)) | 364 | port)) |
365 | { | 365 | { |
366 | ret = 1; | 366 | ret = 1; |
367 | goto cleanup; | 367 | goto cleanup; |
@@ -397,7 +397,7 @@ cleanup: | |||
397 | * @param arg_list | 397 | * @param arg_list |
398 | * @return port number on success or zero on failure | 398 | * @return port number on success or zero on failure |
399 | */ | 399 | */ |
400 | uint16_t | 400 | static uint16_t |
401 | setup_testcase (struct MHD_Daemon **d, uint16_t port, unsigned int daemon_flags, | 401 | setup_testcase (struct MHD_Daemon **d, uint16_t port, unsigned int daemon_flags, |
402 | va_list arg_list) | 402 | va_list arg_list) |
403 | { | 403 | { |
@@ -426,7 +426,7 @@ setup_testcase (struct MHD_Daemon **d, uint16_t port, unsigned int daemon_flags, | |||
426 | } | 426 | } |
427 | 427 | ||
428 | 428 | ||
429 | void | 429 | static void |
430 | teardown_testcase (struct MHD_Daemon *d) | 430 | teardown_testcase (struct MHD_Daemon *d) |
431 | { | 431 | { |
432 | MHD_stop_daemon (d); | 432 | MHD_stop_daemon (d); |