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

src: remove Curl_ prefix from tool-specific function

Browse source 
Since that's a prefix we use for library-private functions

Curl_execpath is now tool_execpath

Closes #16657
This commit is contained in:
Daniel Stenberg 2025-03-10 16:54:16 +01:00
parent 571e92f730
commit 8df315d5b3
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tool_operate.c
View file

@ -3030,7 +3030,7 @@ static CURLcode cacertpaths(struct OperationConfig *config)
if(!env) {
#if defined(CURL_CA_SEARCH_SAFE)
char *cacert = NULL;
FILE *cafile = Curl_execpath("curl-ca-bundle.crt", &cacert);
FILE *cafile = tool_execpath("curl-ca-bundle.crt", &cacert);
if(cafile) {
fclose(cafile);
config->cacert = strdup(cacert);

4
src/tool_parsecfg.c
View file

@ -68,9 +68,9 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
else {
char *fullp;
/* check for .curlrc then _curlrc in the dir of the executable */
file = Curl_execpath(".curlrc", &fullp);
file = tool_execpath(".curlrc", &fullp);
if(!file)
file = Curl_execpath("_curlrc", &fullp);
file = tool_execpath("_curlrc", &fullp);
if(file)
/* this is the filename we read from */
filename = fullp;

2
src/tool_util.c
View file

@ -214,7 +214,7 @@ int tool_ftruncate64(int fd, curl_off_t where)
#endif /* USE_TOOL_FTRUNCATE */
#if defined(_WIN32) && !defined(UNDER_CE)
FILE *Curl_execpath(const char *filename, char **pathp)
FILE *tool_execpath(const char *filename, char **pathp)
{
static char filebuffer[512];
unsigned long len;

2
src/tool_util.h
View file

@ -49,7 +49,7 @@ int struplocompare(const char *p1, const char *p2);
int struplocompare4sort(const void *p1, const void *p2);
#if defined(_WIN32) && !defined(UNDER_CE)
FILE *Curl_execpath(const char *filename, char **pathp);
FILE *tool_execpath(const char *filename, char **pathp);
#endif
#endif /* HEADER_CURL_TOOL_UTIL_H */