romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-24 13:03:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

lib: fix formatting nits (part 3)

Browse source 
From `lib/h` to `lib/w`.

part 1: 47a1ab2ebe #19764
part 2: 86b346443b #19800

Closes #19811
This commit is contained in:
Viktor Szakats 2025-12-02 07:25:18 +01:00
parent dc8c0d54a5
commit c3b030b860
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
102 changed files with 2001 additions and 2226 deletions
Download patch file Download diff file Expand all files Collapse all files

51
lib/socks.c
View file

@ -164,9 +164,9 @@ CURLcode Curl_blockread_all(struct Curl_cfilter *cf,
#if defined(DEBUGBUILD) && !defined(CURL_DISABLE_VERBOSE_STRINGS)
#define DEBUG_AND_VERBOSE
#define sxstate(x,c,d,y) socksstate(x,c,d,y, __LINE__)
#define sxstate(x, c, d, y) socksstate(x, c, d, y, __LINE__)
#else
#define sxstate(x,c,d,y) socksstate(x,c,d,y)
#define sxstate(x, c, d, y) socksstate(x, c, d, y)
#endif
/* always use this function to change state, to make debugging easier */
@ -206,9 +206,9 @@ static CURLproxycode socks_failed(struct socks_state *sx,
}
static CURLproxycode socks_flush(struct socks_state *sx,
struct Curl_cfilter *cf,
struct Curl_easy *data,
bool *done)
struct Curl_cfilter *cf,
struct Curl_easy *data,
bool *done)
{
CURLcode result;
size_t nwritten;
@ -332,8 +332,7 @@ static CURLproxycode socks4_resolving(struct socks_state *sx,
result = Curl_resolv(data, sx->hostname, sx->remote_port,
cf->conn->ip_version, TRUE, &dns);
if(result == CURLE_AGAIN) {
CURL_TRC_CF(data, cf, "SOCKS4 non-blocking resolve of %s",
sx->hostname);
CURL_TRC_CF(data, cf, "SOCKS4 non-blocking resolve of %s", sx->hostname);
return CURLPX_OK;
}
else if(result)
@ -347,8 +346,7 @@ static CURLproxycode socks4_resolving(struct socks_state *sx,
}
if(result || !dns) {
failf(data, "Failed to resolve \"%s\" for SOCKS4 connect.",
sx->hostname);
failf(data, "Failed to resolve \"%s\" for SOCKS4 connect.", sx->hostname);
return CURLPX_RESOLVE_HOST;
}
@ -465,16 +463,16 @@ static CURLproxycode socks4_check_resp(struct socks_state *sx,
}
/*
* This function logs in to a SOCKS4 proxy and sends the specifics to the final
* destination server.
*
* Reference :
* https://www.openssh.com/txt/socks4.protocol
*
* Note :
* Set protocol4a=true for "SOCKS 4A (Simple Extension to SOCKS 4 Protocol)"
* Nonsupport "Identification Protocol (RFC1413)"
*/
* This function logs in to a SOCKS4 proxy and sends the specifics to the final
* destination server.
*
* Reference :
* https://www.openssh.com/txt/socks4.protocol
*
* Note :
* Set protocol4a=true for "SOCKS 4A (Simple Extension to SOCKS 4 Protocol)"
* Nonsupport "Identification Protocol (RFC1413)"
*/
static CURLproxycode socks4_connect(struct Curl_cfilter *cf,
struct socks_state *sx,
struct Curl_easy *data)
@ -733,7 +731,7 @@ static CURLproxycode socks5_auth_init(struct Curl_cfilter *cf,
if(result || (nwritten != ulen))
return CURLPX_SEND_REQUEST;
}
buf[0] = (unsigned char) plen;
buf[0] = (unsigned char)plen;
result = Curl_bufq_write(&sx->iobuf, buf, 1, &nwritten);
if(result || (nwritten != 1))
return CURLPX_SEND_REQUEST;
@ -813,7 +811,7 @@ static CURLproxycode socks5_req1_init(struct socks_state *sx,
const size_t hostname_len = strlen(sx->hostname);
desttype = 3;
destination = (const unsigned char *)sx->hostname;
destlen = (unsigned char) hostname_len; /* one byte length */
destlen = (unsigned char)hostname_len; /* one byte length */
}
req[3] = desttype;
@ -860,8 +858,7 @@ static CURLproxycode socks5_resolving(struct socks_state *sx,
result = Curl_resolv(data, sx->hostname, sx->remote_port,
cf->conn->ip_version, TRUE, &dns);
if(result == CURLE_AGAIN) {
CURL_TRC_CF(data, cf, "SOCKS5 non-blocking resolve of %s",
sx->hostname);
CURL_TRC_CF(data, cf, "SOCKS5 non-blocking resolve of %s", sx->hostname);
return CURLPX_OK;
}
else if(result)
@ -875,8 +872,7 @@ static CURLproxycode socks5_resolving(struct socks_state *sx,
}
if(result || !dns) {
failf(data, "Failed to resolve \"%s\" for SOCKS5 connect.",
sx->hostname);
failf(data, "Failed to resolve \"%s\" for SOCKS5 connect.", sx->hostname);
presult = CURLPX_RESOLVE_HOST;
goto out;
}
@ -893,8 +889,7 @@ static CURLproxycode socks5_resolving(struct socks_state *sx,
}
#endif
if(!hp) {
failf(data, "Failed to resolve \"%s\" for SOCKS5 connect.",
sx->hostname);
failf(data, "Failed to resolve \"%s\" for SOCKS5 connect.", sx->hostname);
presult = CURLPX_RESOLVE_HOST;
goto out;
}
@ -1394,7 +1389,7 @@ static CURLcode socks_cf_query(struct Curl_cfilter *cf,
struct Curl_cftype Curl_cft_socks_proxy = {
"SOCKS",
CF_TYPE_IP_CONNECT|CF_TYPE_PROXY,
CF_TYPE_IP_CONNECT | CF_TYPE_PROXY,
0,
socks_proxy_cf_destroy,
socks_proxy_cf_connect,