src: remove final uses of Curl_ symbol prefixes in tool code

Closes #16678

diff --git a/src/tool_binmode.h b/src/tool_binmode.h
index 0c7e77c838a548d909b4dbadde72a9a8912ebb7d..4da6fb73e1368a78943753c67bafdfd088b3bfc6 100644 (file)
--- a/src/tool_binmode.h
+++ b/src/tool_binmode.h
@@ -33,7 +33,7 @@
 #  define CURL_SET_BINMODE(stream)  (void)setmode(fileno(stream), O_BINARY)
 #endif
 #else
-#  define CURL_SET_BINMODE(stream)  (void)stream; Curl_nop_stmt
+#  define CURL_SET_BINMODE(stream)  (void)stream; tool_nop_stmt
 #endif
 
 #endif /* HEADER_CURL_TOOL_BINMODE_H */

diff --git a/src/tool_filetime.h b/src/tool_filetime.h
index 205e5cee229b758fa12791d4299c96e599a187a9..4830b218c31f8c6520f1ee6034f8b8a53aaafae1 100644 (file)
--- a/src/tool_filetime.h
+++ b/src/tool_filetime.h
@@ -35,7 +35,7 @@ int getfiletime(const char *filename, struct GlobalConfig *global,
 void setfiletime(curl_off_t filetime, const char *filename,
                  struct GlobalConfig *global);
 #else
-#define setfiletime(a,b,c) Curl_nop_stmt
+#define setfiletime(a,b,c) tool_nop_stmt
 #endif /* defined(HAVE_UTIME) || defined(HAVE_UTIMES) ||        \
           (defined(_WIN32) && (SIZEOF_CURL_OFF_T >= 8)) */
 

diff --git a/src/tool_main.c b/src/tool_main.c
index a507de8e286be62f2c0f95f44ff6765e6fb3f179..05a5a4fbdf2746a10ad31ec862dcbc301a77c234 100644 (file)
--- a/src/tool_main.c
+++ b/src/tool_main.c
@@ -141,7 +141,7 @@ static void memory_tracking_init(void)
   }
 }
 #else
-#  define memory_tracking_init() Curl_nop_stmt
+#  define memory_tracking_init() tool_nop_stmt
 #endif
 
 /*

diff --git a/src/tool_operate.c b/src/tool_operate.c
index 5af47ca120856baea6e1a91f5795b1edc427750c..3a8d932973b5c8032c6c08bd7863ca4d5d1cde7b 100644 (file)
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -908,11 +908,10 @@ static CURLcode config2setopts(struct GlobalConfig *global,
   my_setopt(curl, CURLOPT_WRITEFUNCTION, tool_write_cb);
 
   /* Note that if CURLOPT_READFUNCTION is fread (the default), then
-   * lib/telnet.c will Curl_poll() on the input file descriptor
-   * rather than calling the READFUNCTION at regular intervals.
-   * The circumstances in which it is preferable to enable this
-   * behavior, by omitting to set the READFUNCTION & READDATA options,
-   * have not been determined.
+   * lib/telnet.c will poll on the input file descriptor rather than calling
+   * the READFUNCTION at regular intervals. The circumstances in which it is
+   * preferable to enable this behavior, by omitting to set the READFUNCTION &
+   * READDATA options, have not been determined.
    */
   my_setopt(curl, CURLOPT_READDATA, per);
   /* what call to read */

diff --git a/src/tool_setup.h b/src/tool_setup.h
index 2acc6be180a07ece24efba270cfee9d455c001e3..404b447a422452b6e3ba997d0e1d9602b47bcd91 100644 (file)
--- a/src/tool_setup.h
+++ b/src/tool_setup.h
@@ -68,6 +68,10 @@ extern FILE *tool_stderr;
 #  include "tool_strdup.h"
 #endif
 
+#ifndef tool_nop_stmt
+#define tool_nop_stmt do { } while(0)
+#endif
+
 #ifdef _WIN32
 #  define CURL_STRICMP(p1, p2)  _stricmp(p1, p2)
 #elif defined(HAVE_STRCASECMP)