From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 10 Mar 2025 15:54:16 +0000 (+0100)
Subject: src: remove Curl_ prefix from tool-specific function
X-Git-Tag: curl-8_13_0~183
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8df315d5b3d8a2408a883bf524193f38a352166b;p=thirdparty%2Fcurl.git

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 f7efc02c0d..27a1e290a0 100644
--- 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 6f07423e03..0a003e94b2 100644
--- 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 446bb7199c..6bb7c7aefe 100644
--- 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 c10a43f166..cf37f1a9c1 100644
--- 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 */