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/lib564.c | |
| parent | 78480892cdbbc67f419d0acfdf1865043bc31f62 (diff) | |
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/lib564.c')
| -rw-r--r-- | tests/libtest/lib564.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/tests/libtest/lib564.c b/tests/libtest/lib564.c index d831d21e1..96504bd3d 100644 --- a/tests/libtest/lib564.c +++ b/tests/libtest/lib564.c @@ -98,20 +98,16 @@ int test(char *URL) mp_timedout = FALSE; mp_start = tutil_tvnow(); - while (res == CURLM_CALL_MULTI_PERFORM) { - res = (int)curl_multi_perform(m, &running); - if (tutil_tvdiff(tutil_tvnow(), mp_start) > - MULTI_PERFORM_HANG_TIMEOUT) { - mp_timedout = TRUE; - break; - } - if (running <= 0) { - done = TRUE; /* bail out */ - break; - } + res = (int)curl_multi_perform(m, &running); + if (tutil_tvdiff(tutil_tvnow(), mp_start) > + MULTI_PERFORM_HANG_TIMEOUT) { + mp_timedout = TRUE; + break; } - if (mp_timedout || done) + if (running <= 0) { + done = TRUE; /* bail out */ break; + } if (res != CURLM_OK) { fprintf(stderr, "not okay???\n"); @@ -134,8 +130,6 @@ int test(char *URL) res = 195; break; } - - res = CURLM_CALL_MULTI_PERFORM; } if (ml_timedout || mp_timedout) { |