romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-30 14:28:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

lib: add "Curl_" prefix to two global functions

Browse source 
To make it clear what they are and according to our styleguide.

- Curl_cf_ip_happy_insert_after
- Curl_ftp_conns_match

Found with:

$ nm lib/.libs/libcurl.a | grep ' T ' | grep -vi ' curl'

Closes #22245
This commit is contained in:
Daniel Stenberg 2026-07-02 09:43:58 +02:00
parent 03f9751585
commit d3a7e57157
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
6 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/cf-ip-happy.c
View file

@ -1031,13 +1031,13 @@ out:
return result;
}
CURLcode cf_ip_happy_insert_after(struct Curl_cfilter *cf_at,
struct Curl_easy *data,
struct Curl_peer *origin,
struct Curl_peer *peer,
uint8_t transport_peer,
struct Curl_peer *tunnel_peer,
uint8_t tunnel_transport)
CURLcode Curl_cf_ip_happy_insert_after(struct Curl_cfilter *cf_at,
struct Curl_easy *data,
struct Curl_peer *origin,
struct Curl_peer *peer,
uint8_t transport_peer,
struct Curl_peer *tunnel_peer,
uint8_t tunnel_transport)
{
struct Curl_cfilter *cf;
CURLcode result;

14
lib/cf-ip-happy.h
View file

@ -60,13 +60,13 @@ typedef CURLcode cf_ip_connect_create(struct Curl_cfilter **pcf,
* With a `tunnel_peer` present, the filter will be used to proxy tunnel
* to it and the tunnel will use `tunnel_transport`.
*/
CURLcode cf_ip_happy_insert_after(struct Curl_cfilter *cf_at,
struct Curl_easy *data,
struct Curl_peer *origin,
struct Curl_peer *peer,
uint8_t transport_peer,
struct Curl_peer *tunnel_peer,
uint8_t tunnel_transport);
CURLcode Curl_cf_ip_happy_insert_after(struct Curl_cfilter *cf_at,
struct Curl_easy *data,
struct Curl_peer *origin,
struct Curl_peer *peer,
uint8_t transport_peer,
struct Curl_peer *tunnel_peer,
uint8_t tunnel_transport);
extern struct Curl_cftype Curl_cft_ip_happy;

6
lib/cf-setup.c
View file

@ -202,9 +202,9 @@ static CURLcode cf_setup_add_ip_happy(struct Curl_cfilter *cf,
}
#endif /* !CURL_DISABLE_PROXY && !CURL_DISABLE_HTTP */
result = cf_ip_happy_insert_after(cf, data, first_origin, first_peer,
first_transport,
tunnel_peer, ctx->transport);
result = Curl_cf_ip_happy_insert_after(cf, data, first_origin, first_peer,
first_transport,
tunnel_peer, ctx->transport);
if(result) {
CURL_TRC_CF(data, cf, "adding happy eyeballs failed -> %d", (int)result);
return result;

2
lib/ftp.c
View file

@ -4449,7 +4449,7 @@ static CURLcode ftp_setup_connection(struct Curl_easy *data,
return result;
}
bool ftp_conns_match(struct connectdata *needle, struct connectdata *conn)
bool Curl_ftp_conns_match(struct connectdata *needle, struct connectdata *conn)
{
struct ftp_conn *nftpc = Curl_conn_meta_get(needle, CURL_META_FTP_CONN);
struct ftp_conn *cftpc = Curl_conn_meta_get(conn, CURL_META_FTP_CONN);

3
lib/ftp.h
View file

@ -28,7 +28,8 @@
#ifndef CURL_DISABLE_FTP
extern const struct Curl_protocol Curl_protocol_ftp;
bool ftp_conns_match(struct connectdata *needle, struct connectdata *conn);
bool Curl_ftp_conns_match(struct connectdata *needle,
struct connectdata *conn);
typedef enum {
FTPFILE_MULTICWD = 1, /* as defined by RFC1738 */

2
lib/url.c
View file

@ -942,7 +942,7 @@ static bool url_match_proto_config(struct connectdata *conn,
#endif
#ifndef CURL_DISABLE_FTP
else if(get_protocol_family(m->needle->scheme) & PROTO_FAMILY_FTP) {
if(!ftp_conns_match(m->needle, conn))
if(!Curl_ftp_conns_match(m->needle, conn))
return FALSE;
}
#endif