diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2019-07-30 11:02:03 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2019-07-30 11:02:03 +0200 |
| commit | a405fb6748a96d7f6935efcf0b50900b9274ab00 (patch) | |
| tree | 50f36fb7de90e5550646cc95864d8d9c9aa222a4 /lib/http.c | |
| parent | 041690aadb1357775ff06c5bf827a98585627c76 (diff) | |
| download | curl-a405fb6748a96d7f6935efcf0b50900b9274ab00.tar.gz | |
cleanup: remove the 'numsocks' argument used in many placesbagder/remove-numsocks
It was used (intended) to pass in the size of the 'socks' array that is
also passed to these functions, but was rarely actually checked/used and
the array is defined to a fixed size of MAX_SOCKSPEREASYHANDLE entries
that should be used instead.
Diffstat (limited to 'lib/http.c')
| -rw-r--r-- | lib/http.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/lib/http.c b/lib/http.c index 065a26817..83180fb29 100644 --- a/lib/http.c +++ b/lib/http.c @@ -88,8 +88,7 @@ */ static int http_getsock_do(struct connectdata *conn, - curl_socket_t *socks, - int numsocks); + curl_socket_t *socks); static int http_should_fail(struct connectdata *conn); #ifndef CURL_DISABLE_PROXY @@ -99,8 +98,7 @@ static CURLcode add_haproxy_protocol_header(struct connectdata *conn); #ifdef USE_SSL static CURLcode https_connecting(struct connectdata *conn, bool *done); static int https_getsock(struct connectdata *conn, - curl_socket_t *socks, - int numsocks); + curl_socket_t *socks); #else #define https_connecting(x,y) CURLE_COULDNT_CONNECT #endif @@ -1509,11 +1507,9 @@ CURLcode Curl_http_connect(struct connectdata *conn, bool *done) interface and then we're always _sending_ a request and thus we wait for the single socket to become writable only */ static int http_getsock_do(struct connectdata *conn, - curl_socket_t *socks, - int numsocks) + curl_socket_t *socks) { /* write mode */ - (void)numsocks; /* unused, we trust it to be at least 1 */ socks[0] = conn->sock[FIRSTSOCKET]; return GETSOCK_WRITESOCK(0); } @@ -1585,11 +1581,10 @@ static CURLcode https_connecting(struct connectdata *conn, bool *done) } static int https_getsock(struct connectdata *conn, - curl_socket_t *socks, - int numsocks) + curl_socket_t *socks) { if(conn->handler->flags & PROTOPT_SSL) - return Curl_ssl_getsock(conn, socks, numsocks); + return Curl_ssl_getsock(conn, socks); return GETSOCK_BLANK; } #endif /* USE_SSL */ |