]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
tests: verify OPEN/CLOSESOCKETFUNCTION
authorYang Tse <yangsita@gmail.com>
Thu, 19 May 2011 20:28:28 +0000 (22:28 +0200)
committerYang Tse <yangsita@gmail.com>
Thu, 19 May 2011 20:28:28 +0000 (22:28 +0200)
Test 585: Fix opensocket return type, and avoid function name clash.

tests/libtest/lib500.c

index 166bb85abc13e65ad71ef573f4739558e2c7bee2..bca5c2310ea9242785ec5f4768a5fb0ff87f11f3 100644 (file)
@@ -27,9 +27,9 @@
 
 int counter;
 
-static int opensocket(void *clientp,
-                      curlsocktype purpose,
-                      struct curl_sockaddr *addr)
+static curl_socket_t tst_opensocket(void *clientp,
+                                    curlsocktype purpose,
+                                    struct curl_sockaddr *addr)
 {
   (void)clientp;
   (void)purpose;
@@ -37,7 +37,7 @@ static int opensocket(void *clientp,
   return socket(addr->family, addr->socktype, addr->protocol);
 }
 
-static int closesocket(void *clientp, curl_socket_t sock)
+static int tst_closesocket(void *clientp, curl_socket_t sock)
 {
   (void)clientp;
   printf("[CLOSE] counter: %d\n", counter--);
@@ -46,8 +46,8 @@ static int closesocket(void *clientp, curl_socket_t sock)
 
 static void setupcallbacks(CURL *curl)
 {
-  curl_easy_setopt(curl, CURLOPT_OPENSOCKETFUNCTION, opensocket);
-  curl_easy_setopt(curl, CURLOPT_CLOSESOCKETFUNCTION, closesocket);
+  curl_easy_setopt(curl, CURLOPT_OPENSOCKETFUNCTION, tst_opensocket);
+  curl_easy_setopt(curl, CURLOPT_CLOSESOCKETFUNCTION, tst_closesocket);
   counter = 0;
 }