diff options
author | Daniel Stenberg <daniel@haxx.se> | 2011-06-26 23:12:08 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2011-06-27 16:01:41 +0200 |
commit | fb48e2050b558c908c7740d1c4f20fd17fdf7fe6 (patch) | |
tree | 9425a7c6a674d87bc58792f1a25169260968a0d6 /tests/libtest/lib582.c | |
parent | 78480892cdbbc67f419d0acfdf1865043bc31f62 (diff) | |
download | curl-fb48e2050b558c908c7740d1c4f20fd17fdf7fe6.tar.gz |
libtests: stop checking for CURLM_CALL_MULTI_PERFORM
CURLM_CALL_MULTI_PERFORM stopped being a valid return code from
curl_multi_perform back in 7.20.0. All the libcurl tests are ajusted to
this and no longer check for this return code. Makes them simpler.
Diffstat (limited to 'tests/libtest/lib582.c')
-rw-r--r-- | tests/libtest/lib582.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/libtest/lib582.c b/tests/libtest/lib582.c index 3b7f1afee..2f8fcd992 100644 --- a/tests/libtest/lib582.c +++ b/tests/libtest/lib582.c @@ -182,8 +182,7 @@ static void notifyCurl(CURL* curl, curl_socket_t s, int evBitmask, { int numhandles = 0; CURLMcode result = curl_multi_socket_action(curl, s, evBitmask, &numhandles); - if (result != CURLM_OK && result != CURLM_CALL_MULTI_PERFORM) - { + if (result != CURLM_OK) { fprintf(stderr, "Curl error on %s: %i (%s)\n", info, result, curl_multi_strerror(result)); } @@ -196,10 +195,8 @@ static void checkFdSet(CURL* curl, struct Sockets* sockets, fd_set* fdset, int evBitmask, const char* name) { int i; - for (i = 0; i < sockets->count; ++i) - { - if (FD_ISSET(sockets->sockets[i], fdset)) - { + for (i = 0; i < sockets->count; ++i) { + if (FD_ISSET(sockets->sockets[i], fdset)) { notifyCurl(curl, sockets->sockets[i], evBitmask, name); } } |