src: remove Curl_ prefix from tool-specific function

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

Curl_execpath is now tool_execpath

Closes #16657

diff --git a/src/tool_operate.c b/src/tool_operate.c
index f7efc02c0d14ec601a7741a36b98106f64b5bc7a..27a1e290a04948889f1b2ef298b96b53ca6adc51 100644 (file)
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -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);

diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c
index 6f07423e03577f4290ddb98e6fae49d4eba3a7f0..0a003e94b23a2054b993825e27692f659e69bc72 100644 (file)
--- a/src/tool_parsecfg.c
+++ b/src/tool_parsecfg.c
@@ -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;

diff --git a/src/tool_util.c b/src/tool_util.c
index 446bb7199c187616cefee07f868ac65858a90a1f..6bb7c7aefe4e77b34def3e09fa6c45859d1c43a6 100644 (file)
--- a/src/tool_util.c
+++ b/src/tool_util.c
@@ -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;

diff --git a/src/tool_util.h b/src/tool_util.h
index c10a43f166bab6b65ede0a5581e627fcc8281166..cf37f1a9c1ca4b66ecd9e7542de8082b3becc826 100644 (file)
--- a/src/tool_util.h
+++ b/src/tool_util.h
@@ -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 */