← Commit list

ad26a6cb99

Viktor Szakats
Viktor Szakats
2025-09-20
FAILED Duration: 148s

Subject

tidy-up: avoid using the reserved macro namespace

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

docs/examples/http2-upload.c +2 -2docs/internals/CODE_STYLE.md +1 -0lib/amigaos.c +4 -3lib/curl_mem_undef.h +1 -1lib/curl_memory.h +3 -3lib/curl_setup.h +1 -1lib/curl_sspi.c +2 -2lib/easy_lock.h +6 -8lib/memdebug.h +3 -3lib/rand.c +5 -7lib/vauth/digest_sspi.c +1 -1lib/vauth/vauth.c +1 -1lib/vtls/schannel.c +1 -1scripts/checksrc.pl +1 -0src/tool_doswin.c +4 -3src/tool_findfile.c +4 -0
docs/examples/http2-upload.c+2 -2
@@ -71,14 +71,14 @@ int my_gettimeofday(struct timeval *tp, void *tzp)
(void)tzp;
if(tp) {
/* Offset between 1601-01-01 and 1970-01-01 in 100 nanosec units */
- #define _WIN32_FT_OFFSET (116444736000000000)
+ #define WIN32_FT_OFFSET (116444736000000000)
union {
CURL_TYPEOF_CURL_OFF_T ns100; /* time since 1 Jan 1601 in 100ns units */
FILETIME ft;
} _now;
GetSystemTimeAsFileTime(&_now.ft);
tp->tv_usec = (long)((_now.ns100 / 10) % 1000000);
- tp->tv_sec = (long)((_now.ns100 - _WIN32_FT_OFFSET) / 10000000);
+ tp->tv_sec = (long)((_now.ns100 - WIN32_FT_OFFSET) / 10000000);
}
return 0;
}
docs/internals/CODE_STYLE.md+1 -0
@@ -335,6 +335,7 @@ This is the full list of functions generally banned.
_mbscat
_mbsncat
_tcscat
+ _tcsdup
_tcsncat
_waccess
_wcscat
lib/amigaos.c+4 -3
@@ -199,8 +199,9 @@ struct Library *SocketBase = NULL;
#ifdef __libnix__
void __request(const char *msg);
+#define CURL_AMIGA_REQUEST(msg) __request(msg)
#else
-# define __request(msg) Printf((const unsigned char *)(msg "\n\a"), 0)
+#define CURL_AMIGA_REQUEST(msg) Printf((const unsigned char *)(msg "\n\a"), 0)
#endif
void Curl_amiga_cleanup(void)
@@ -217,14 +218,14 @@ CURLcode Curl_amiga_init(void)
SocketBase = OpenLibrary((const unsigned char *)"bsdsocket.library", 4);
if(!SocketBase) {
- __request("No TCP/IP Stack running!");
+ CURL_AMIGA_REQUEST("No TCP/IP Stack running!");
return CURLE_FAILED_INIT;
}
if(SocketBaseTags(SBTM_SETVAL(SBTC_ERRNOPTR(sizeof(errno))), (ULONG) &errno,
SBTM_SETVAL(SBTC_LOGTAGPTR), (ULONG) "curl",
TAG_DONE)) {
- __request("SocketBaseTags ERROR");
+ CURL_AMIGA_REQUEST("SocketBaseTags ERROR");
return CURLE_FAILED_INIT;
}
lib/curl_mem_undef.h+1 -1
@@ -30,7 +30,7 @@
#undef realloc
#undef free
#ifdef _WIN32
-#undef _tcsdup
+#undef Curl_tcsdup
#endif
#ifdef CURLDEBUG
lib/curl_memory.h+3 -3
@@ -77,11 +77,11 @@
#define free(ptr) Curl_cfree(ptr)
#ifdef _WIN32
-#undef _tcsdup
+#undef Curl_tcsdup
#ifdef UNICODE
-#define _tcsdup(ptr) Curl_wcsdup(ptr)
+#define Curl_tcsdup(ptr) Curl_wcsdup(ptr)
#else
-#define _tcsdup(ptr) Curl_cstrdup(ptr)
+#define Curl_tcsdup(ptr) Curl_cstrdup(ptr)
#endif
#endif /* _WIN32 */
lib/curl_setup.h+1 -1
@@ -46,7 +46,7 @@
fail. Fixed in 14.2.0_1. Disable the workaround if the fix is detected. */
#if defined(__APPLE__) && !defined(__clang__) && defined(__GNUC__) && \
defined(__has_attribute)
-# if !defined(__has_feature)
+# if !defined(__has_feature) /* Keep this PP check separate from others */
# define availability curl_pp_attribute_disabled
# elif !__has_feature(attribute_availability)
# define availability curl_pp_attribute_disabled
lib/curl_sspi.c+2 -2
@@ -138,7 +138,7 @@ CURLcode Curl_create_sspi_identity(const char *userp, const char *passwdp,
}
/* Setup the identity's user and length */
- dup_user.tchar_ptr = _tcsdup(user.tchar_ptr);
+ dup_user.tchar_ptr = Curl_tcsdup(user.tchar_ptr);
if(!dup_user.tchar_ptr) {
curlx_unicodefree(useranddomain.tchar_ptr);
return CURLE_OUT_OF_MEMORY;
@@ -165,7 +165,7 @@ CURLcode Curl_create_sspi_identity(const char *userp, const char *passwdp,
passwd.tchar_ptr = curlx_convert_UTF8_to_tchar(passwdp);
if(!passwd.tchar_ptr)
return CURLE_OUT_OF_MEMORY;
- dup_passwd.tchar_ptr = _tcsdup(passwd.tchar_ptr);
+ dup_passwd.tchar_ptr = Curl_tcsdup(passwd.tchar_ptr);
if(!dup_passwd.tchar_ptr) {
curlx_unicodefree(passwd.tchar_ptr);
return CURLE_OUT_OF_MEMORY;
lib/easy_lock.h+6 -8
@@ -45,20 +45,18 @@
#define curl_simple_lock atomic_int
#define CURL_SIMPLE_LOCK_INIT 0
-/* a clang-thing */
-#ifndef __has_builtin
-#define __has_builtin(x) 0
-#endif
-
#ifndef __INTEL_COMPILER
/* The Intel compiler tries to look like GCC *and* clang *and* lies in its
__has_builtin() function, so override it. */
/* if GCC on i386/x86_64 or if the built-in is present */
-#if ( (defined(__GNUC__) && !defined(__clang__)) && \
- (defined(__i386__) || defined(__x86_64__))) || \
- __has_builtin(__builtin_ia32_pause)
+#if (defined(__GNUC__) && !defined(__clang__)) && \
+ (defined(__i386__) || defined(__x86_64__))
#define HAVE_BUILTIN_IA32_PAUSE
+#elif defined(__has_builtin) /* Keep this PP check separate from others */
+#if __has_builtin(__builtin_ia32_pause)
+#define HAVE_BUILTIN_IA32_PAUSE
+#endif
#endif
#endif
lib/memdebug.h+3 -3
@@ -48,11 +48,11 @@
#define recv(a,b,c,d) curl_dbg_recv(a,b,c,d, __LINE__, __FILE__)
#ifdef _WIN32
-#undef _tcsdup
+#undef Curl_tcsdup
#ifdef UNICODE
-#define _tcsdup(ptr) curl_dbg_wcsdup(ptr, __LINE__, __FILE__)
+#define Curl_tcsdup(ptr) curl_dbg_wcsdup(ptr, __LINE__, __FILE__)
#else
-#define _tcsdup(ptr) curl_dbg_strdup(ptr, __LINE__, __FILE__)
+#define Curl_tcsdup(ptr) curl_dbg_strdup(ptr, __LINE__, __FILE__)
#endif
#endif /* _WIN32 */
lib/rand.c+5 -7
@@ -149,12 +149,6 @@ static CURLcode weak_random(struct Curl_easy *data,
}
#endif
-#ifdef USE_SSL
-#define _random(x,y,z) Curl_ssl_random(x,y,z)
-#else
-#define _random(x,y,z) weak_random(x,y,z)
-#endif
-
static CURLcode randit(struct Curl_easy *data, unsigned int *rnd,
bool env_override)
{
@@ -185,7 +179,11 @@ static CURLcode randit(struct Curl_easy *data, unsigned int *rnd,
#endif
/* data may be NULL! */
- return _random(data, (unsigned char *)rnd, sizeof(*rnd));
+#ifdef USE_SSL
+ return Curl_ssl_random(data, (unsigned char *)rnd, sizeof(*rnd));
+#else
+ return weak_random(data, (unsigned char *)rnd, sizeof(*rnd));
+#endif
}
/*
lib/vauth/digest_sspi.c+1 -1
@@ -277,7 +277,7 @@ CURLcode Curl_override_sspi_http_realm(const char *chlg,
if(!domain.tchar_ptr)
return CURLE_OUT_OF_MEMORY;
- dup_domain.tchar_ptr = _tcsdup(domain.tchar_ptr);
+ dup_domain.tchar_ptr = Curl_tcsdup(domain.tchar_ptr);
if(!dup_domain.tchar_ptr) {
curlx_unicodefree(domain.tchar_ptr);
return CURLE_OUT_OF_MEMORY;
lib/vauth/vauth.c+1 -1
@@ -100,7 +100,7 @@ TCHAR *Curl_auth_build_spn(const char *service, const char *host,
free(utf8_spn);
if(!tchar_spn)
return NULL;
- dupe_tchar_spn = _tcsdup(tchar_spn);
+ dupe_tchar_spn = Curl_tcsdup(tchar_spn);
curlx_unicodefree(tchar_spn);
return dupe_tchar_spn;
}
lib/vtls/schannel.c+1 -1
@@ -433,7 +433,7 @@ get_cert_location(TCHAR *path, DWORD *store_name, TCHAR **store_path,
return CURLE_SSL_CERTPROBLEM;
*sep = TEXT('\0');
- *store_path = _tcsdup(store_path_start);
+ *store_path = Curl_tcsdup(store_path_start);
*sep = TEXT('\\');
if(!*store_path)
return CURLE_OUT_OF_MEMORY;
scripts/checksrc.pl+1 -0
@@ -62,6 +62,7 @@ my %banfunc = (
"_mbscat" => 1,
"_mbsncat" => 1,
"_tcscat" => 1,
+ "_tcsdup" => 1,
"_tcsncat" => 1,
"_wcscat" => 1,
"_wcsncat" => 1,
src/tool_doswin.c+4 -3
@@ -46,9 +46,10 @@
# undef PATH_MAX
# define PATH_MAX MAX_PATH
#elif !defined(__DJGPP__) || (__DJGPP__ < 2) /* DJGPP 2.0 has _use_lfn() */
-# define _use_lfn(f) (0) /* long filenames never available */
+# define CURL_USE_LFN(f) 0 /* long filenames never available */
#elif defined(__DJGPP__)
-# include <fcntl.h> /* _use_lfn(f) prototype */
+# include <fcntl.h> /* for _use_lfn(f) prototype */
+# define CURL_USE_LFN(f) _use_lfn(f)
#endif
#ifdef MSDOS
@@ -314,7 +315,7 @@ static SANITIZEcode msdosify(char **const sanitized, const char *file_name,
return SANITIZE_ERR_INVALID_PATH;
/* Support for Windows 9X VFAT systems, when available. */
- if(_use_lfn(file_name)) {
+ if(CURL_USE_LFN(file_name)) {
illegal_aliens = illegal_chars_w95;
len -= (illegal_chars_w95 - illegal_chars_dos);
}
src/tool_findfile.c+4 -0
@@ -24,10 +24,14 @@
#include "tool_setup.h"
#ifdef HAVE_PWD_H
+#ifdef __AMIGA__
#undef __NO_NET_API /* required for AmigaOS to declare getpwuid() */
+#endif
#include <pwd.h>
+#ifdef __AMIGA__
#define __NO_NET_API
#endif
+#endif
#ifdef HAVE_FCNTL_H
#include <fcntl.h>