romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-15 02:11:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Closes #16678
This commit is contained in:
Daniel Stenberg 2025-03-12 09:03:45 +01:00
parent 67a1cfa5ef
commit af3fe375b3
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
5 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tool_binmode.h
View file

@ -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 */

2
src/tool_filetime.h
View file

@ -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)) */

2
src/tool_main.c
View file

@ -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
/*

9
src/tool_operate.c
View file

@ -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 */

4
src/tool_setup.h
View file

@ -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)