diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2013-02-18 00:14:35 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2013-02-18 00:14:35 +0100 |
| commit | ed7174c6f66550bce83c6278670cdfad9eb7751c (patch) | |
| tree | c5a9e421c2c591e62cf3e1b54d5247ddbfdc601e /lib/pingpong.c | |
| parent | 072b1ad15a5cfa34ba4519247c4bb44c056b800a (diff) | |
| download | curl-ed7174c6f66550bce83c6278670cdfad9eb7751c.tar.gz | |
compiler warning fix: declaration of 'wait' shadows a global declaration
It seems older gcc installations (at least) will cause warnings if we
name a variable 'wait'. Now changed to 'block' instead.
Reported by: Jiří Hruška
Bug: http://curl.haxx.se/mail/lib-2013-02/0247.html
Diffstat (limited to 'lib/pingpong.c')
| -rw-r--r-- | lib/pingpong.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pingpong.c b/lib/pingpong.c index eeeeec339..4b10e845e 100644 --- a/lib/pingpong.c +++ b/lib/pingpong.c @@ -79,7 +79,7 @@ long Curl_pp_state_timeout(struct pingpong *pp) /* * Curl_pp_statemach() */ -CURLcode Curl_pp_statemach(struct pingpong *pp, bool wait) +CURLcode Curl_pp_statemach(struct pingpong *pp, bool block) { struct connectdata *conn = pp->conn; curl_socket_t sock = conn->sock[FIRSTSOCKET]; @@ -94,7 +94,7 @@ CURLcode Curl_pp_statemach(struct pingpong *pp, bool wait) return CURLE_OPERATION_TIMEDOUT; /* already too little time */ } - if(wait) { + if(block) { interval_ms = 1000; /* use 1 second timeout intervals */ if(timeout_ms < interval_ms) interval_ms = timeout_ms; @@ -106,7 +106,7 @@ CURLcode Curl_pp_statemach(struct pingpong *pp, bool wait) pp->sendleft?sock:CURL_SOCKET_BAD, /* writing */ interval_ms); - if(wait) { + if(block) { /* if we didn't wait, we don't have to spend time on this now */ if(Curl_pgrsUpdate(conn)) result = CURLE_ABORTED_BY_CALLBACK; |