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

tidy-up: prefer ifdef/ifndef for single checks

Browse source 
Closes #18018
This commit is contained in:
Viktor Szakats 2025-07-25 14:31:16 +02:00
parent b2bccdc257
commit 89771d19d5
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
109 changed files with 319 additions and 324 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/curl/curl.h
View file

@ -102,7 +102,7 @@
#include <sys/time.h>
#endif
#ifdef __cplusplus
#ifdef __cplusplus
extern "C" {
#endif
@ -124,7 +124,7 @@ typedef void CURLSH;
#elif defined(_WIN32) || \
(CURL_HAS_DECLSPEC_ATTRIBUTE(dllexport) && \
CURL_HAS_DECLSPEC_ATTRIBUTE(dllimport))
# if defined(BUILDING_LIBCURL)
# ifdef BUILDING_LIBCURL
# define CURL_EXTERN __declspec(dllexport)
# else
# define CURL_EXTERN __declspec(dllimport)
@ -3302,7 +3302,7 @@ CURL_EXTERN CURLcode curl_easy_ssls_export(CURL *handle,
void *userptr);
#ifdef __cplusplus
#ifdef __cplusplus
} /* end of extern "C" */
#endif

4
include/curl/easy.h
View file

@ -23,7 +23,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#ifdef __cplusplus
#ifdef __cplusplus
extern "C" {
#endif
@ -118,7 +118,7 @@ CURL_EXTERN CURLcode curl_easy_send(CURL *curl, const void *buffer,
*/
CURL_EXTERN CURLcode curl_easy_upkeep(CURL *curl);
#ifdef __cplusplus
#ifdef __cplusplus
} /* end of extern "C" */
#endif

2
include/curl/header.h
View file

@ -24,7 +24,7 @@
*
***************************************************************************/
#ifdef __cplusplus
#ifdef __cplusplus
extern "C" {
#endif

6
include/curl/mprintf.h
View file

@ -28,7 +28,7 @@
#include <stdio.h> /* needed for FILE */
#include "curl.h" /* for CURL_EXTERN */
#ifdef __cplusplus
#ifdef __cplusplus
extern "C" {
#endif
@ -38,7 +38,7 @@ extern "C" {
defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \
!defined(CURL_NO_FMT_CHECKS)
#if defined(__MINGW32__) && !defined(__clang__)
#if defined(__MINGW_PRINTF_FORMAT) /* mingw-w64 3.0.0+. Needs stdio.h. */
#ifdef __MINGW_PRINTF_FORMAT /* mingw-w64 3.0.0+. Needs stdio.h. */
#define CURL_TEMP_PRINTF(fmt, arg) \
__attribute__((format(__MINGW_PRINTF_FORMAT, fmt, arg)))
#else
@ -78,7 +78,7 @@ CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args)
#undef CURL_TEMP_PRINTF
#ifdef __cplusplus
#ifdef __cplusplus
} /* end of extern "C" */
#endif

2
include/curl/multi.h
View file

@ -50,7 +50,7 @@
*/
#include "curl.h"
#ifdef __cplusplus
#ifdef __cplusplus
extern "C" {
#endif

2
include/curl/options.h
View file

@ -24,7 +24,7 @@
*
***************************************************************************/
#ifdef __cplusplus
#ifdef __cplusplus
extern "C" {
#endif

18
include/curl/system.h
View file

@ -66,7 +66,7 @@
# define CURL_TYPEOF_CURL_SOCKLEN_T int
#elif defined(__POCC__)
# if defined(_MSC_VER)
# ifdef _MSC_VER
# define CURL_TYPEOF_CURL_OFF_T __int64
# define CURL_FORMAT_CURL_OFF_T "I64d"
# define CURL_FORMAT_CURL_OFF_TU "I64u"
@ -82,7 +82,7 @@
# define CURL_TYPEOF_CURL_SOCKLEN_T int
#elif defined(__LCC__)
# if defined(__MCST__) /* MCST eLbrus Compiler Collection */
# ifdef __MCST__ /* MCST eLbrus Compiler Collection */
# define CURL_TYPEOF_CURL_OFF_T long
# define CURL_FORMAT_CURL_OFF_T "ld"
# define CURL_FORMAT_CURL_OFF_TU "lu"
@ -118,7 +118,7 @@
# define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int
#elif defined(__TANDEM)
# if !defined(__LP64)
# ifndef __LP64
# define CURL_TYPEOF_CURL_OFF_T long long
# define CURL_FORMAT_CURL_OFF_T "lld"
# define CURL_FORMAT_CURL_OFF_TU "llu"
@ -135,7 +135,7 @@
# endif
#elif defined(UNDER_CE)
# if defined(__MINGW32CE__)
# ifdef __MINGW32CE__
# define CURL_TYPEOF_CURL_OFF_T long long
# define CURL_FORMAT_CURL_OFF_T "lld"
# define CURL_FORMAT_CURL_OFF_TU "llu"
@ -162,7 +162,7 @@
# define CURL_PULL_SYS_TYPES_H 1
#elif defined(__VMS)
# if defined(__VAX)
# ifdef __VAX
# define CURL_TYPEOF_CURL_OFF_T long
# define CURL_FORMAT_CURL_OFF_T "ld"
# define CURL_FORMAT_CURL_OFF_TU "lu"
@ -188,7 +188,7 @@
# define CURL_PULL_SYS_SOCKET_H 1
#elif defined(__MVS__)
# if defined(_LONG_LONG)
# ifdef _LONG_LONG
# define CURL_TYPEOF_CURL_OFF_T long long
# define CURL_FORMAT_CURL_OFF_T "lld"
# define CURL_FORMAT_CURL_OFF_TU "llu"
@ -207,7 +207,7 @@
#elif defined(__370__)
# if defined(__IBMC__) || defined(__IBMCPP__)
# if defined(_LONG_LONG)
# ifdef _LONG_LONG
# define CURL_TYPEOF_CURL_OFF_T long long
# define CURL_FORMAT_CURL_OFF_T "lld"
# define CURL_FORMAT_CURL_OFF_TU "llu"
@ -266,7 +266,7 @@
# define CURL_PULL_SYS_SOCKET_H 1
#elif defined(__xlc__) /* IBM xlc compiler */
# if !defined(_LP64)
# ifndef _LP64
# define CURL_TYPEOF_CURL_OFF_T long long
# define CURL_FORMAT_CURL_OFF_T "lld"
# define CURL_FORMAT_CURL_OFF_TU "llu"
@ -284,7 +284,7 @@
# define CURL_PULL_SYS_SOCKET_H 1
#elif defined(__hpux) /* HP aCC compiler */
# if !defined(_LP64)
# ifndef _LP64
# define CURL_TYPEOF_CURL_OFF_T long long
# define CURL_FORMAT_CURL_OFF_T "lld"
# define CURL_FORMAT_CURL_OFF_TU "llu"

2
include/curl/urlapi.h
View file

@ -26,7 +26,7 @@
#include "curl.h"
#ifdef __cplusplus
#ifdef __cplusplus
extern "C" {
#endif

4
include/curl/websockets.h
View file

@ -24,7 +24,7 @@
*
***************************************************************************/
#ifdef __cplusplus
#ifdef __cplusplus
extern "C" {
#endif
@ -78,7 +78,7 @@ CURL_EXTERN CURLcode curl_ws_send(CURL *curl, const void *buffer,
CURL_EXTERN const struct curl_ws_frame *curl_ws_meta(CURL *curl);
#ifdef __cplusplus
#ifdef __cplusplus
}
#endif

2
lib/asyn.h
View file

@ -236,7 +236,7 @@ struct doh_probes;
#ifdef USE_CURL_ASYNC
struct Curl_async {
#ifdef CURLRES_ARES /* */
#ifdef CURLRES_ARES
struct async_ares_ctx ares;
#elif defined(CURLRES_THREADED)
struct async_thrdd_ctx thrdd;

3
lib/cf-h2-proxy.h
View file

@ -33,7 +33,6 @@ CURLcode Curl_cf_h2_proxy_insert_after(struct Curl_cfilter *cf,
extern struct Curl_cftype Curl_cft_h2_proxy;
#endif /* defined(USE_NGHTTP2) && !defined(CURL_DISABLE_PROXY) */
#endif /* USE_NGHTTP2 && !CURL_DISABLE_PROXY */
#endif /* HEADER_CURL_H2_PROXY_H */

2
lib/cf-haproxy.c
View file

@ -24,7 +24,7 @@
#include "curl_setup.h"
#if !defined(CURL_DISABLE_PROXY)
#ifndef CURL_DISABLE_PROXY
#include <curl/curl.h>
#include "urldata.h"

2
lib/cf-haproxy.h
View file

@ -27,7 +27,7 @@
#include "curl_setup.h"
#include "urldata.h"
#if !defined(CURL_DISABLE_PROXY)
#ifndef CURL_DISABLE_PROXY
CURLcode Curl_cf_haproxy_insert_after(struct Curl_cfilter *cf_at,
struct Curl_easy *data);

4
lib/cf-https-connect.c
View file

@ -24,7 +24,7 @@
#include "curl_setup.h"
#if !defined(CURL_DISABLE_HTTP)
#ifndef CURL_DISABLE_HTTP
#include "urldata.h"
#include <curl/curl.h>
@ -749,4 +749,4 @@ out:
return result;
}
#endif /* !defined(CURL_DISABLE_HTTP) */
#endif /* !CURL_DISABLE_HTTP */

4
lib/cf-https-connect.h
View file

@ -25,7 +25,7 @@
***************************************************************************/
#include "curl_setup.h"
#if !defined(CURL_DISABLE_HTTP)
#ifndef CURL_DISABLE_HTTP
struct Curl_cfilter;
struct Curl_easy;
@ -45,5 +45,5 @@ CURLcode Curl_cf_https_setup(struct Curl_easy *data,
int sockindex);
#endif /* !defined(CURL_DISABLE_HTTP) */
#endif /* !CURL_DISABLE_HTTP */
#endif /* HEADER_CURL_CF_HTTP_H */

16
lib/cf-socket.c
View file

@ -109,7 +109,7 @@ static void set_ipv6_v6only(curl_socket_t sockfd, int on)
static void tcpnodelay(struct Curl_easy *data, curl_socket_t sockfd)
{
#if defined(TCP_NODELAY)
#ifdef TCP_NODELAY
curl_socklen_t onoff = (curl_socklen_t) 1;
int level = IPPROTO_TCP;
char buffer[STRERROR_LEN];
@ -136,7 +136,7 @@ static void nosigpipe(struct Curl_easy *data,
(void)data;
if(setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE,
(void *)&onoff, sizeof(onoff)) < 0) {
#if !defined(CURL_DISABLE_VERBOSE_STRINGS)
#ifndef CURL_DISABLE_VERBOSE_STRINGS
char buffer[STRERROR_LEN];
infof(data, "Could not set SO_NOSIGPIPE: %s",
Curl_strerror(SOCKERRNO, buffer, sizeof(buffer)));
@ -188,9 +188,9 @@ tcpkeepalive(struct Curl_easy *data,
sockfd, SOCKERRNO);
}
else {
#if defined(SIO_KEEPALIVE_VALS) /* Windows */
#ifdef SIO_KEEPALIVE_VALS /* Windows */
/* Windows 10, version 1709 (10.0.16299) and later versions */
#if defined(CURL_WINSOCK_KEEP_SSO)
#ifdef CURL_WINSOCK_KEEP_SSO
optval = curlx_sltosi(data->set.tcp_keepidle);
KEEPALIVE_FACTOR(optval);
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPIDLE,
@ -885,7 +885,7 @@ static CURLcode socket_connect_result(struct Curl_easy *data,
switch(error) {
case SOCKEINPROGRESS:
case SOCKEWOULDBLOCK:
#if defined(EAGAIN)
#ifdef EAGAIN
#if (EAGAIN) != (SOCKEWOULDBLOCK)
/* On some platforms EAGAIN and EWOULDBLOCK are the
* same value, and on others they are different, hence
@ -1237,8 +1237,8 @@ static int do_connect(struct Curl_cfilter *cf, struct Curl_easy *data,
(void)data;
if(is_tcp_fastopen) {
#if defined(CONNECT_DATA_IDEMPOTENT) /* Darwin */
# if defined(HAVE_BUILTIN_AVAILABLE)
#ifdef CONNECT_DATA_IDEMPOTENT /* Darwin */
# ifdef HAVE_BUILTIN_AVAILABLE
/* while connectx function is available since macOS 10.11 / iOS 9,
it did not have the interface declared correctly until
Xcode 9 / macOS SDK 10.13 */
@ -1505,7 +1505,7 @@ static CURLcode cf_socket_send(struct Curl_cfilter *cf, struct Curl_easy *data,
else
*pnwritten = (size_t)nwritten;
#if defined(USE_WINSOCK)
#ifdef USE_WINSOCK
if(!result)
win_update_sndbuf_size(ctx);
#endif

8
lib/connect.c
View file

@ -1309,7 +1309,7 @@ connect_sub_chain:
}
#endif /* USE_SSL */
#if !defined(CURL_DISABLE_HTTP)
#ifndef CURL_DISABLE_HTTP
if(cf->conn->bits.tunnel_proxy) {
result = Curl_cf_http_proxy_insert_after(cf, data);
if(result)
@ -1323,7 +1323,7 @@ connect_sub_chain:
#endif /* !CURL_DISABLE_PROXY */
if(ctx->state < CF_SETUP_CNNCT_HAPROXY) {
#if !defined(CURL_DISABLE_PROXY)
#ifndef CURL_DISABLE_PROXY
if(data->set.haproxyprotocol) {
if(Curl_conn_is_ssl(cf->conn, cf->sockindex)) {
failf(data, "haproxy protocol not support with SSL "
@ -1502,7 +1502,7 @@ CURLcode Curl_conn_setup(struct Curl_easy *data,
Curl_resolv_unlink(data, &data->state.dns[sockindex]);
data->state.dns[sockindex] = dns;
#if !defined(CURL_DISABLE_HTTP)
#ifndef CURL_DISABLE_HTTP
if(!conn->cfilter[sockindex] &&
conn->handler->protocol == CURLPROTO_HTTPS) {
DEBUGASSERT(ssl_mode != CURL_CF_SSL_DISABLE);
@ -1510,7 +1510,7 @@ CURLcode Curl_conn_setup(struct Curl_easy *data,
if(result)
goto out;
}
#endif /* !defined(CURL_DISABLE_HTTP) */
#endif /* !CURL_DISABLE_HTTP */
/* Still no cfilter set, apply default. */
if(!conn->cfilter[sockindex]) {

4
lib/cshutdn.c
View file

@ -498,7 +498,7 @@ void Curl_cshutdn_setfds(struct cshutdn *cshutdn,
Curl_detach_connection(data);
for(i = 0; i < ps.num; i++) {
#if defined(__DJGPP__)
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
@ -506,7 +506,7 @@ void Curl_cshutdn_setfds(struct cshutdn *cshutdn,
FD_SET(ps.sockets[i], read_fd_set);
if(ps.actions[i] & CURL_POLL_OUT)
FD_SET(ps.sockets[i], write_fd_set);
#if defined(__DJGPP__)
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
if((ps.actions[i] & (CURL_POLL_OUT | CURL_POLL_IN)) &&

6
lib/curl_addrinfo.c
View file

@ -68,7 +68,7 @@
*/
#if defined(__INTEL_COMPILER) && (__INTEL_COMPILER == 910) && \
defined(__OPTIMIZE__) && defined(__unix__) && defined(__i386__)
defined(__OPTIMIZE__) && defined(__unix__) && defined(__i386__)
/* workaround icc 9.1 optimizer issue */
# define vqualifier volatile
#else
@ -513,7 +513,7 @@ curl_dbg_freeaddrinfo(struct addrinfo *freethis,
freeaddrinfo(freethis);
#endif
}
#endif /* defined(CURLDEBUG) && defined(HAVE_FREEADDRINFO) */
#endif /* CURLDEBUG && HAVE_FREEADDRINFO */
#if defined(CURLDEBUG) && defined(HAVE_GETADDRINFO)
@ -553,7 +553,7 @@ curl_dbg_getaddrinfo(const char *hostname,
source, line);
return res;
}
#endif /* defined(CURLDEBUG) && defined(HAVE_GETADDRINFO) */
#endif /* CURLDEBUG && HAVE_GETADDRINFO */
#if defined(HAVE_GETADDRINFO) && defined(USE_RESOLVE_ON_IPS)
/*

2
lib/curl_gssapi.c
View file

@ -34,7 +34,7 @@
#include "curl_memory.h"
#include "memdebug.h"
#if defined(__GNUC__)
#ifdef __GNUC__
#define CURL_ALIGN8 __attribute__((aligned(8)))
#else
#define CURL_ALIGN8

4
lib/curl_md4.h
View file

@ -27,13 +27,13 @@
#include "curl_setup.h"
#include <curl/curl.h>
#if defined(USE_CURL_NTLM_CORE)
#ifdef USE_CURL_NTLM_CORE
#define MD4_DIGEST_LENGTH 16
CURLcode Curl_md4it(unsigned char *output, const unsigned char *input,
const size_t len);
#endif /* defined(USE_CURL_NTLM_CORE) */
#endif /* USE_CURL_NTLM_CORE */
#endif /* HEADER_CURL_MD4_H */

30
lib/curl_ntlm_core.c
View file

@ -24,7 +24,7 @@
#include "curl_setup.h"
#if defined(USE_CURL_NTLM_CORE)
#ifdef USE_CURL_NTLM_CORE
/*
* NTLM details:
@ -51,26 +51,26 @@
in NTLM type-3 messages.
*/
#if defined(USE_OPENSSL)
#ifdef USE_OPENSSL
#include <openssl/opensslconf.h>
#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_DEPRECATED_3_0)
#define USE_OPENSSL_DES
#endif
#elif defined(USE_WOLFSSL)
#include <wolfssl/options.h>
#if !defined(NO_DES3)
#ifndef NO_DES3
#define USE_OPENSSL_DES
#endif
#endif
#if defined(USE_OPENSSL_DES)
#ifdef USE_OPENSSL_DES
#if defined(USE_OPENSSL)
#ifdef USE_OPENSSL
# include <openssl/des.h>
# include <openssl/md5.h>
# include <openssl/ssl.h>
# include <openssl/rand.h>
# if defined(OPENSSL_IS_AWSLC)
# ifdef OPENSSL_IS_AWSLC
# define DES_set_key_unchecked (void)DES_set_key
# define DESKEYARG(x) *x
# define DESKEY(x) &x
@ -83,7 +83,7 @@
# include <wolfssl/openssl/md5.h>
# include <wolfssl/openssl/ssl.h>
# include <wolfssl/openssl/rand.h>
# if defined(OPENSSL_COEXIST)
# ifdef OPENSSL_COEXIST
# define DES_key_schedule WOLFSSL_DES_key_schedule
# define DES_cblock WOLFSSL_DES_cblock
# define DES_set_odd_parity wolfSSL_DES_set_odd_parity
@ -129,7 +129,7 @@
#include "curl_memory.h"
#include "memdebug.h"
#if !defined(CURL_NTLM_NOT_SUPPORTED)
#ifndef CURL_NTLM_NOT_SUPPORTED
/*
* Turns a 56-bit key into being 64-bit wide.
*/
@ -146,7 +146,7 @@ static void extend_key_56_to_64(const unsigned char *key_56, char *key)
}
#endif
#if defined(USE_OPENSSL_DES)
#ifdef USE_OPENSSL_DES
/*
* Turns a 56-bit key into a 64-bit, odd parity key and sets the key. The
* key schedule ks is also set.
@ -277,7 +277,7 @@ static bool encrypt_des(const unsigned char *in, unsigned char *out,
return TRUE;
}
#endif /* defined(USE_WIN32_CRYPTO) */
#endif /* USE_WIN32_CRYPTO */
/*
* takes a 21 byte array and treats it as 3 56-bit DES keys. The
@ -288,7 +288,7 @@ void Curl_ntlm_core_lm_resp(const unsigned char *keys,
const unsigned char *plaintext,
unsigned char *results)
{
#if defined(USE_OPENSSL_DES)
#ifdef USE_OPENSSL_DES
DES_key_schedule ks;
setup_des_key(keys, DESKEY(ks));
@ -329,7 +329,7 @@ CURLcode Curl_ntlm_core_mk_lm_hash(const char *password,
unsigned char *lmbuffer /* 21 bytes */)
{
unsigned char pw[14];
#if !defined(CURL_NTLM_NOT_SUPPORTED)
#ifndef CURL_NTLM_NOT_SUPPORTED
static const unsigned char magic[] = {
0x4B, 0x47, 0x53, 0x21, 0x40, 0x23, 0x24, 0x25 /* i.e. KGS!@#$% */
};
@ -342,7 +342,7 @@ CURLcode Curl_ntlm_core_mk_lm_hash(const char *password,
{
/* Create LanManager hashed password. */
#if defined(USE_OPENSSL_DES)
#ifdef USE_OPENSSL_DES
DES_key_schedule ks;
setup_des_key(pw, DESKEY(ks));
@ -380,7 +380,7 @@ static void ascii_to_unicode_le(unsigned char *dest, const char *src,
}
}
#if !defined(USE_WINDOWS_SSPI)
#ifndef USE_WINDOWS_SSPI
static void ascii_uppercase_to_unicode_le(unsigned char *dest,
const char *src, size_t srclen)
@ -422,7 +422,7 @@ CURLcode Curl_ntlm_core_mk_nt_hash(const char *password,
return result;
}
#if !defined(USE_WINDOWS_SSPI)
#ifndef USE_WINDOWS_SSPI
#define NTLMv2_BLOB_SIGNATURE "\x01\x01\x00\x00"
#define NTLMv2_BLOB_LEN (44 -16 + ntlm->target_info_len + 4)

4
lib/curl_ntlm_core.h
View file

@ -26,7 +26,7 @@
#include "curl_setup.h"
#if defined(USE_CURL_NTLM_CORE)
#ifdef USE_CURL_NTLM_CORE
#include "vauth/vauth.h"
@ -47,7 +47,7 @@ CURLcode Curl_ntlm_core_mk_lm_hash(const char *password,
CURLcode Curl_ntlm_core_mk_nt_hash(const char *password,
unsigned char *ntbuffer /* 21 bytes */);
#if !defined(USE_WINDOWS_SSPI)
#ifndef USE_WINDOWS_SSPI
CURLcode Curl_hmac_md5(const unsigned char *key, unsigned int keylen,
const unsigned char *data, unsigned int datalen,

4
lib/curl_sasl.c
View file

@ -557,7 +557,7 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct Curl_easy *data,
/* Calculate the supported authentication mechanism, by decreasing order of
security, as well as the initial response where appropriate */
if(sasl_choose_external(data, &sctx) ||
#if defined(USE_KERBEROS5)
#ifdef USE_KERBEROS5
sasl_choose_krb5(data, &sctx) ||
#endif
#ifdef USE_GSASL
@ -722,7 +722,7 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct Curl_easy *data,
}
#endif
#if defined(USE_KERBEROS5)
#ifdef USE_KERBEROS5
case SASL_GSSAPI: {
struct kerberos5data *krb5 = Curl_auth_krb5_get(conn);
result = !krb5 ? CURLE_OUT_OF_MEMORY :

12
lib/curl_setup.h
View file

@ -331,10 +331,10 @@
#define CURL_CONC_MACROS(A,B) CURL_CONC_MACROS_(A,B)
/* curl uses its own printf() function internally. It understands the GNU
* format. Use this format, so that is matches the GNU format attribute we
* format. Use this format, so that it matches the GNU format attribute we
* use with the MinGW compiler, allowing it to verify them at compile-time.
*/
#ifdef __MINGW32__
#ifdef __MINGW32__
# undef CURL_FORMAT_CURL_OFF_T
# undef CURL_FORMAT_CURL_OFF_TU
# define CURL_FORMAT_CURL_OFF_T "lld"
@ -549,11 +549,11 @@
#ifndef SIZEOF_OFF_T
# if defined(__VMS) && !defined(__VAX)
# if defined(_LARGEFILE)
# ifdef _LARGEFILE
# define SIZEOF_OFF_T 8
# endif
# elif defined(__OS400__) && defined(__ILEC400__)
# if defined(_LARGE_FILES)
# ifdef _LARGE_FILES
# define SIZEOF_OFF_T 8
# endif
# elif defined(__MVS__) && defined(__IBMC__)
@ -932,7 +932,7 @@ endings either CRLF or LF so 't' is appropriate.
/* for systems that do not detect this in configure */
#ifndef CURL_SA_FAMILY_T
# if defined(HAVE_SA_FAMILY_T)
# ifdef HAVE_SA_FAMILY_T
# define CURL_SA_FAMILY_T sa_family_t
# elif defined(HAVE_ADDRESS_FAMILY)
# define CURL_SA_FAMILY_T ADDRESS_FAMILY
@ -1003,7 +1003,7 @@ int getpwuid_r(uid_t uid, struct passwd *pwd, char *buf,
#endif
#if defined(USE_UNIX_SOCKETS) && defined(_WIN32)
# if !defined(UNIX_PATH_MAX)
# ifndef UNIX_PATH_MAX
/* Replicating logic present in afunix.h
(distributed with newer Windows 10 SDK versions only) */
# define UNIX_PATH_MAX 108

6
lib/curl_sha512_256.c
View file

@ -38,7 +38,7 @@
* * Rustls
* Skip the backend if it does not support the required algorithm */
#if defined(USE_OPENSSL)
#ifdef USE_OPENSSL
# include <openssl/opensslv.h>
# if (!defined(LIBRESSL_VERSION_NUMBER) && \
defined(OPENSSL_VERSION_NUMBER) && \
@ -78,12 +78,12 @@
#if !defined(HAS_SHA512_256_IMPLEMENTATION) && defined(USE_GNUTLS)
# include <nettle/sha.h>
# if defined(SHA512_256_DIGEST_SIZE)
# ifdef SHA512_256_DIGEST_SIZE
# define USE_GNUTLS_SHA512_256 1
# endif
#endif /* ! HAS_SHA512_256_IMPLEMENTATION && USE_GNUTLS */
#if defined(USE_OPENSSL_SHA512_256)
#ifdef USE_OPENSSL_SHA512_256
/* OpenSSL does not provide macros for SHA-512/256 sizes */

4
lib/curl_threads.c
View file

@ -26,7 +26,7 @@
#include <curl/curl.h>
#if defined(USE_THREADS_POSIX)
#ifdef USE_THREADS_POSIX
# ifdef HAVE_PTHREAD_H
# include <pthread.h>
# endif
@ -39,7 +39,7 @@
/* The last #include file should be: */
#include "memdebug.h"
#if defined(USE_THREADS_POSIX)
#ifdef USE_THREADS_POSIX
struct Curl_actual_call {
unsigned int (*func)(void *);

2
lib/curl_threads.h
View file

@ -25,7 +25,7 @@
***************************************************************************/
#include "curl_setup.h"
#if defined(USE_THREADS_POSIX)
#ifdef USE_THREADS_POSIX
# define CURL_STDCALL
# define curl_mutex_t pthread_mutex_t
# define curl_thread_t pthread_t *

12
lib/curl_trc.c
View file

@ -199,7 +199,7 @@ void Curl_failf(struct Curl_easy *data, const char *fmt, ...)
}
}
#if !defined(CURL_DISABLE_VERBOSE_STRINGS)
#ifndef CURL_DISABLE_VERBOSE_STRINGS
static void trc_infof(struct Curl_easy *data,
struct curl_trc_feat *feat,
@ -471,8 +471,8 @@ static struct trc_cft_def trc_cfts[] = {
{ &Curl_cft_ssl_proxy, TRC_CT_PROXY },
#endif
#endif
#if !defined(CURL_DISABLE_PROXY)
#if !defined(CURL_DISABLE_HTTP)
#ifndef CURL_DISABLE_PROXY
#ifndef CURL_DISABLE_HTTP
{ &Curl_cft_h1_proxy, TRC_CT_PROXY },
#ifdef USE_NGHTTP2
{ &Curl_cft_h2_proxy, TRC_CT_PROXY },
@ -485,7 +485,7 @@ static struct trc_cft_def trc_cfts[] = {
#if !defined(CURL_DISABLE_HTTP) && defined(USE_HTTP3)
{ &Curl_cft_http3, TRC_CT_PROTOCOL },
#endif
#if !defined(CURL_DISABLE_HTTP)
#ifndef CURL_DISABLE_HTTP
{ &Curl_cft_http_connect, TRC_CT_PROTOCOL },
#endif
};
@ -580,7 +580,7 @@ CURLcode Curl_trc_init(void)
#endif
}
#else /* defined(CURL_DISABLE_VERBOSE_STRINGS) */
#else /* CURL_DISABLE_VERBOSE_STRINGS */
CURLcode Curl_trc_init(void)
{
@ -646,4 +646,4 @@ void Curl_trc_ssls(struct Curl_easy *data, const char *fmt, ...)
}
#endif
#endif /* !defined(CURL_DISABLE_VERBOSE_STRINGS) */
#endif /* !CURL_DISABLE_VERBOSE_STRINGS */

4
lib/curl_trc.h
View file

@ -203,7 +203,7 @@ extern struct curl_trc_feat Curl_trc_feat_dns;
(ft)->log_level >= CURL_LOG_LVL_INFO)
#define CURL_MSTATE_NAME(s) Curl_trc_mstate_name((int)(s))
#else /* defined(CURL_DISABLE_VERBOSE_STRINGS) */
#else /* CURL_DISABLE_VERBOSE_STRINGS */
/* All informational messages are not compiled in for size savings */
#define Curl_trc_is_verbose(d) (FALSE)
@ -211,6 +211,6 @@ extern struct curl_trc_feat Curl_trc_feat_dns;
#define Curl_trc_ft_is_verbose(x,y) (FALSE)
#define CURL_MSTATE_NAME(x) ((void)(x), "-")
#endif /* !defined(CURL_DISABLE_VERBOSE_STRINGS) */
#endif /* !CURL_DISABLE_VERBOSE_STRINGS */
#endif /* HEADER_CURL_TRC_H */

2
lib/curlx/nonblock.c
View file

@ -46,7 +46,7 @@
int curlx_nonblock(curl_socket_t sockfd, /* operate on this */
int nonblock /* TRUE or FALSE */)
{
#if defined(HAVE_FCNTL_O_NONBLOCK)
#ifdef HAVE_FCNTL_O_NONBLOCK
/* most recent Unix versions */
int flags;
flags = sfcntl(sockfd, F_GETFL, 0);

2
lib/curlx/wait.c
View file

@ -68,7 +68,7 @@ int curlx_wait_ms(timediff_t timeout_ms)
SET_SOCKERRNO(SOCKEINVAL);
return -1;
}
#if defined(MSDOS)
#ifdef MSDOS
delay((unsigned int)timeout_ms);
#elif defined(_WIN32)
/* prevent overflow, timeout_ms is typecast to ULONG/DWORD. */

6
lib/easy.c
View file

@ -107,7 +107,7 @@ static curl_simple_lock s_lock = CURL_SIMPLE_LOCK_INIT;
* ways, but at this point it must be defined as the system-supplied strdup
* so the callback pointer is initialized correctly.
*/
#if defined(UNDER_CE)
#ifdef UNDER_CE
#define system_strdup _strdup
#elif !defined(HAVE_STRDUP)
#define system_strdup Curl_strdup
@ -465,7 +465,7 @@ static int events_socket(CURL *easy, /* easy handle */
bool found = FALSE;
struct Curl_easy *data = easy;
#if defined(CURL_DISABLE_VERBOSE_STRINGS)
#ifdef CURL_DISABLE_VERBOSE_STRINGS
(void)easy;
#endif
(void)socketp;
@ -822,7 +822,6 @@ static CURLcode easy_perform(struct Curl_easy *data, bool events)
return result;
}
/*
* curl_easy_perform() is the external interface that performs a blocking
* transfer as previously setup.
@ -841,7 +840,6 @@ CURLcode curl_easy_perform_ev(struct Curl_easy *data)
{
return easy_perform(data, TRUE);
}
#endif
/*

2
lib/easy_lock.h
View file

@ -44,7 +44,7 @@
#elif defined(HAVE_ATOMIC) && defined(HAVE_STDATOMIC_H)
#include <stdatomic.h>
#if defined(HAVE_SCHED_YIELD)
#ifdef HAVE_SCHED_YIELD
#include <sched.h>
#endif

2
lib/file.c
View file

@ -348,7 +348,7 @@ static CURLcode file_upload(struct Curl_easy *data,
mode |= O_TRUNC;
#if (defined(ANDROID) || defined(__ANDROID__)) && \
(defined(__i386__) || defined(__arm__))
(defined(__i386__) || defined(__arm__))
fd = open(file->path, mode, (mode_t)data->set.new_file_perms);
#else
fd = open(file->path, mode, data->set.new_file_perms);

3
lib/fileinfo.c
View file

@ -23,7 +23,9 @@
***************************************************************************/
#include "curl_setup.h"
#ifndef CURL_DISABLE_FTP
#include "strdup.h"
#include "fileinfo.h"
#include "curl_memory.h"
@ -43,4 +45,5 @@ void Curl_fileinfo_cleanup(struct fileinfo *finfo)
curlx_dyn_free(&finfo->buf);
free(finfo);
}
#endif

2
lib/fopen.c
View file

@ -136,7 +136,7 @@ CURLcode Curl_fopen(struct Curl_easy *data, const char *filename,
result = CURLE_WRITE_ERROR;
#if (defined(ANDROID) || defined(__ANDROID__)) && \
(defined(__i386__) || defined(__arm__))
(defined(__i386__) || defined(__arm__))
fd = open(tempstore, O_WRONLY | O_CREAT | O_EXCL, (mode_t)(0600|sb.st_mode));
#else
fd = open(tempstore, O_WRONLY | O_CREAT | O_EXCL, 0600|sb.st_mode);

2
lib/ftp.c
View file

@ -150,7 +150,7 @@ static void _ftp_state(struct Curl_easy *data,
#endif
)
{
#if defined(CURL_DISABLE_VERBOSE_STRINGS)
#ifdef CURL_DISABLE_VERBOSE_STRINGS
(void)data;
#ifdef DEBUGBUILD
(void)lineno;

4
lib/hostip.c
View file

@ -1258,7 +1258,7 @@ CURLcode Curl_loadhostpairs(struct Curl_easy *data)
struct Curl_addrinfo *head = NULL, *tail = NULL;
size_t entry_len;
char address[64];
#if !defined(CURL_DISABLE_VERBOSE_STRINGS)
#ifndef CURL_DISABLE_VERBOSE_STRINGS
const char *addresses = NULL;
#endif
curl_off_t port = 0;
@ -1283,7 +1283,7 @@ CURLcode Curl_loadhostpairs(struct Curl_easy *data)
curlx_str_single(&host, ':'))
goto err;
#if !defined(CURL_DISABLE_VERBOSE_STRINGS)
#ifndef CURL_DISABLE_VERBOSE_STRINGS
addresses = host;
#endif

10
lib/hostip4.c
View file

@ -94,8 +94,7 @@ struct Curl_addrinfo *Curl_sync_getaddrinfo(struct Curl_easy *data,
#endif /* CURLRES_SYNCH */
#endif /* CURLRES_IPV4 */
#if defined(CURLRES_IPV4) && \
!defined(CURLRES_ARES) && !defined(CURLRES_AMIGA)
#if defined(CURLRES_IPV4) && !defined(CURLRES_ARES) && !defined(CURLRES_AMIGA)
/*
* Curl_ipv4_resolve_r() - ipv4 threadsafe resolver function.
@ -108,7 +107,7 @@ struct Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname,
int port)
{
#if !(defined(HAVE_GETADDRINFO) && defined(HAVE_GETADDRINFO_THREADSAFE)) && \
defined(HAVE_GETHOSTBYNAME_R_3)
defined(HAVE_GETHOSTBYNAME_R_3)
int res;
#endif
struct Curl_addrinfo *ai = NULL;
@ -149,7 +148,7 @@ struct Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname,
* platforms.
*/
#if defined(HAVE_GETHOSTBYNAME_R_5)
#ifdef HAVE_GETHOSTBYNAME_R_5
/* Solaris, IRIX and more */
h = gethostbyname_r(hostname,
(struct hostent *)buf,
@ -287,5 +286,4 @@ struct Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname,
return ai;
}
#endif /* defined(CURLRES_IPV4) && !defined(CURLRES_ARES) &&
!defined(CURLRES_AMIGA) */
#endif /* CURLRES_IPV4 && !CURLRES_ARES && !CURLRES_AMIGA */

2
lib/hostip6.c
View file

@ -57,7 +57,7 @@
#include "curl_memory.h"
#include "memdebug.h"
#if defined(CURLRES_SYNCH)
#ifdef CURLRES_SYNCH
#ifdef DEBUG_ADDRINFO
static void dump_addrinfo(const struct Curl_addrinfo *ai)

14
lib/http.c
View file

@ -474,7 +474,7 @@ static CURLcode http_perhapsrewind(struct Curl_easy *data,
if(abort_upload) {
/* We'd like to abort the upload - but should we? */
#if defined(USE_NTLM)
#ifdef USE_NTLM
if((data->state.authproxy.picked == CURLAUTH_NTLM) ||
(data->state.authhost.picked == CURLAUTH_NTLM)) {
ongoing_auth = "NTLM";
@ -486,7 +486,7 @@ static CURLcode http_perhapsrewind(struct Curl_easy *data,
}
}
#endif
#if defined(USE_SPNEGO)
#ifdef USE_SPNEGO
/* There is still data left to send */
if((data->state.authproxy.picked == CURLAUTH_NEGOTIATE) ||
(data->state.authhost.picked == CURLAUTH_NEGOTIATE)) {
@ -1896,7 +1896,7 @@ static CURLcode http_host(struct Curl_easy *data, struct connectdata *conn)
ptr = Curl_checkheaders(data, STRCONST("Host"));
if(ptr && (!data->state.this_is_a_follow ||
curl_strequal(data->state.first_host, conn->host.name))) {
#if !defined(CURL_DISABLE_COOKIES)
#ifndef CURL_DISABLE_COOKIES
/* If we have a given custom Host: header, we extract the hostname in
order to possibly use it for cookie reasons later on. We only allow the
custom Host: header if this is NOT a redirect, as setting Host: in the
@ -2422,7 +2422,7 @@ out:
return result;
}
#if !defined(CURL_DISABLE_COOKIES)
#ifndef CURL_DISABLE_COOKIES
static CURLcode http_cookies(struct Curl_easy *data,
struct connectdata *conn,
@ -3321,7 +3321,7 @@ static CURLcode http_header_s(struct Curl_easy *data,
(void)hdlen;
#endif
#if !defined(CURL_DISABLE_COOKIES)
#ifndef CURL_DISABLE_COOKIES
v = (data->cookies && data->state.cookie_engine) ?
HD_VAL(hd, hdlen, "Set-Cookie:") : NULL;
if(v) {
@ -3815,7 +3815,7 @@ static CURLcode http_on_response(struct Curl_easy *data,
/* At this point we have some idea about the fate of the connection.
If we are closing the connection it may result auth failure. */
#if defined(USE_NTLM)
#ifdef USE_NTLM
if(conn->bits.close &&
(((data->req.httpcode == 401) &&
(conn->http_ntlm_state == NTLMSTATE_TYPE2)) ||
@ -3825,7 +3825,7 @@ static CURLcode http_on_response(struct Curl_easy *data,
data->state.authproblem = TRUE;
}
#endif
#if defined(USE_SPNEGO)
#ifdef USE_SPNEGO
if(conn->bits.close &&
(((data->req.httpcode == 401) &&
(conn->http_negotiate_state == GSS_AUTHRECV)) ||

2
lib/http.h
View file

@ -58,7 +58,7 @@ typedef unsigned char http_majors;
#ifndef CURL_DISABLE_HTTP
#if defined(USE_HTTP3)
#ifdef USE_HTTP3
#include <stdint.h>
#endif

6
lib/http2.c
View file

@ -488,7 +488,7 @@ static int on_header(nghttp2_session *session, const nghttp2_frame *frame,
const uint8_t *value, size_t valuelen,
uint8_t flags,
void *userp);
#if !defined(CURL_DISABLE_VERBOSE_STRINGS)
#ifndef CURL_DISABLE_VERBOSE_STRINGS
static int error_callback(nghttp2_session *session, const char *msg,
size_t len, void *userp);
#endif
@ -523,7 +523,7 @@ static CURLcode cf_h2_ctx_open(struct Curl_cfilter *cf,
nghttp2_session_callbacks_set_on_begin_headers_callback(
cbs, on_begin_headers);
nghttp2_session_callbacks_set_on_header_callback(cbs, on_header);
#if !defined(CURL_DISABLE_VERBOSE_STRINGS)
#ifndef CURL_DISABLE_VERBOSE_STRINGS
nghttp2_session_callbacks_set_error_callback(cbs, error_callback);
#endif
@ -1779,7 +1779,7 @@ static ssize_t req_body_read_callback(nghttp2_session *session,
return (nread == 0) ? NGHTTP2_ERR_DEFERRED : nread;
}
#if !defined(CURL_DISABLE_VERBOSE_STRINGS)
#ifndef CURL_DISABLE_VERBOSE_STRINGS
static int error_callback(nghttp2_session *session,
const char *msg,
size_t len,

2
lib/http_aws_sigv4.c
View file

@ -1149,4 +1149,4 @@ static bool should_urlencode(struct Curl_str *service_name)
return true;
}
#endif /* !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_AWS) */
#endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_AWS */

2
lib/http_digest.c
View file

@ -120,7 +120,7 @@ CURLcode Curl_output_digest(struct Curl_easy *data,
if(!passwdp)
passwdp = "";
#if defined(USE_WINDOWS_SSPI)
#ifdef USE_WINDOWS_SSPI
have_chlg = !!digest->input_token;
#else
have_chlg = !!digest->nonce;

2
lib/http_ntlm.c
View file

@ -45,7 +45,7 @@
/* SSL backend-specific #if branches in this file must be kept in the order
documented in curl_ntlm_core. */
#if defined(USE_WINDOWS_SSPI)
#ifdef USE_WINDOWS_SSPI
#include "curl_sspi.h"
#endif

2
lib/httpsrr.h
View file

@ -76,7 +76,7 @@ void Curl_httpsrr_cleanup(struct Curl_https_rrinfo *rrinfo);
#define HTTPS_RR_CODE_ECH 0x05
#define HTTPS_RR_CODE_IPV6 0x06
#if defined(USE_ARES)
#ifdef USE_ARES
CURLcode Curl_httpsrr_from_ares(struct Curl_easy *data,
const ares_dns_record_t *dnsrec,
struct Curl_https_rrinfo *hinfo);

2
lib/idn.c
View file

@ -51,7 +51,7 @@
#include "memdebug.h"
/* for macOS and iOS targets */
#if defined(USE_APPLE_IDN)
#ifdef USE_APPLE_IDN
#include <unicode/uidna.h>
#include <iconv.h>
#include <langinfo.h>

2
lib/if2ip.c
View file

@ -94,7 +94,7 @@ unsigned int Curl_ipv6_scope(const struct sockaddr *sa)
#if !defined(CURL_DISABLE_BINDLOCAL) || !defined(CURL_DISABLE_FTP)
#if defined(HAVE_GETIFADDRS)
#ifdef HAVE_GETIFADDRS
if2ip_result_t Curl_if2ip(int af,
#ifdef USE_IPV6

46
lib/ldap.c
View file

@ -43,7 +43,7 @@
*/
/* Wincrypt must be included before anything that could include OpenSSL. */
#if defined(USE_WIN32_CRYPTO)
#ifdef USE_WIN32_CRYPTO
#include <wincrypt.h>
/* Undefine wincrypt conflicting symbols for BoringSSL. */
#undef X509_NAME
@ -105,7 +105,7 @@
struct ldap_urldesc {
char *lud_host;
int lud_port;
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
TCHAR *lud_dn;
TCHAR **lud_attrs;
#else
@ -113,7 +113,7 @@ struct ldap_urldesc {
char **lud_attrs;
#endif
int lud_scope;
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
TCHAR *lud_filter;
#else
char *lud_filter;
@ -224,9 +224,9 @@ const struct Curl_handler Curl_handler_ldaps = {
};
#endif
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
#if defined(USE_WINDOWS_SSPI)
#ifdef USE_WINDOWS_SSPI
static int ldap_win_bind_auth(LDAP *server, const char *user,
const char *passwd, unsigned long authflags)
{
@ -236,19 +236,19 @@ static int ldap_win_bind_auth(LDAP *server, const char *user,
memset(&cred, 0, sizeof(cred));
#if defined(USE_SPNEGO)
#ifdef USE_SPNEGO
if(authflags & CURLAUTH_NEGOTIATE) {
method = LDAP_AUTH_NEGOTIATE;
}
else
#endif
#if defined(USE_NTLM)
#ifdef USE_NTLM
if(authflags & CURLAUTH_NTLM) {
method = LDAP_AUTH_NTLM;
}
else
#endif
#if !defined(CURL_DISABLE_DIGEST_AUTH)
#ifndef CURL_DISABLE_DIGEST_AUTH
if(authflags & CURLAUTH_DIGEST) {
method = LDAP_AUTH_DIGEST;
}
@ -273,7 +273,7 @@ static int ldap_win_bind_auth(LDAP *server, const char *user,
}
return rc;
}
#endif /* #if defined(USE_WINDOWS_SSPI) */
#endif /* USE_WINDOWS_SSPI */
static int ldap_win_bind(struct Curl_easy *data, LDAP *server,
const char *user, const char *passwd)
@ -292,7 +292,7 @@ static int ldap_win_bind(struct Curl_easy *data, LDAP *server,
curlx_unicodefree(inuser);
curlx_unicodefree(inpass);
}
#if defined(USE_WINDOWS_SSPI)
#ifdef USE_WINDOWS_SSPI
else {
rc = (int)ldap_win_bind_auth(server, user, passwd, data->set.httpauth);
}
@ -300,9 +300,9 @@ static int ldap_win_bind(struct Curl_easy *data, LDAP *server,
return rc;
}
#endif /* #if defined(USE_WIN32_LDAP) */
#endif /* USE_WIN32_LDAP */
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
#define FREE_ON_WINLDAP(x) curlx_unicodefree(x)
#define curl_ldap_num_t ULONG
#else
@ -328,7 +328,7 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
#ifdef LDAP_OPT_NETWORK_TIMEOUT
struct timeval ldap_timeout = {10, 0}; /* 10 sec connection/search timeout */
#endif
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
TCHAR *host = NULL;
#else
char *host = NULL;
@ -358,7 +358,7 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
infof(data, "LDAP local: trying to establish %s connection",
ldap_ssl ? "encrypted" : "cleartext");
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
host = curlx_convert_UTF8_to_tchar(conn->host.name);
if(!host) {
result = CURLE_OUT_OF_MEMORY;
@ -516,7 +516,7 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
entryIterator;
entryIterator = ldap_next_entry(server, entryIterator), num++) {
BerElement *ber = NULL;
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
TCHAR *attribute;
#else
char *attribute;
@ -527,7 +527,7 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
{
char *name;
size_t name_len;
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
TCHAR *dn = ldap_get_dn(server, entryIterator);
name = curlx_convert_tchar_to_UTF8(dn);
if(!name) {
@ -574,7 +574,7 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
attribute = ldap_next_attribute(server, entryIterator, ber)) {
BerValue **vals;
size_t attr_len;
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
char *attr = curlx_convert_tchar_to_UTF8(attribute);
if(!attr) {
if(ber)
@ -837,7 +837,7 @@ static int _ldap_url_parse2(struct Curl_easy *data,
goto quit;
}
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
/* Convert the unescaped string to a tchar */
ludp->lud_dn = curlx_convert_UTF8_to_tchar(unescaped);
@ -868,7 +868,7 @@ static int _ldap_url_parse2(struct Curl_easy *data,
const char *atp = p;
/* Allocate our array (+1 for the NULL entry) */
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
ludp->lud_attrs = calloc(count + 1, sizeof(TCHAR *));
#else
ludp->lud_attrs = calloc(count + 1, sizeof(char *));
@ -896,7 +896,7 @@ static int _ldap_url_parse2(struct Curl_easy *data,
goto quit;
}
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
/* Convert the unescaped string to a tchar */
ludp->lud_attrs[i] = curlx_convert_UTF8_to_tchar(unescaped);
@ -960,7 +960,7 @@ static int _ldap_url_parse2(struct Curl_easy *data,
goto quit;
}
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
/* Convert the unescaped string to a tchar */
ludp->lud_filter = curlx_convert_UTF8_to_tchar(unescaped);
@ -1016,7 +1016,7 @@ static void _ldap_free_urldesc(LDAPURLDesc *ludp)
if(!ludp)
return;
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
curlx_unicodefree(ludp->lud_dn);
curlx_unicodefree(ludp->lud_filter);
#else
@ -1027,7 +1027,7 @@ static void _ldap_free_urldesc(LDAPURLDesc *ludp)
if(ludp->lud_attrs) {
size_t i;
for(i = 0; i < ludp->lud_attrs_dups; i++) {
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
curlx_unicodefree(ludp->lud_attrs[i]);
#else
free(ludp->lud_attrs[i]);

4
lib/md4.c
View file

@ -24,7 +24,7 @@
#include "curl_setup.h"
#if defined(USE_CURL_NTLM_CORE)
#ifdef USE_CURL_NTLM_CORE
#include <string.h>
@ -220,7 +220,7 @@ static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size)
static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
{
if(ctx->data) {
#if !defined(HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS)
#ifndef HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS
mbedtls_md4(ctx->data, ctx->size, result);
#else
(void)mbedtls_md4_ret(ctx->data, ctx->size, result);

8
lib/md5.c
View file

@ -57,7 +57,7 @@
#endif
#endif
#if defined(USE_GNUTLS)
#ifdef USE_GNUTLS
#include <nettle/md5.h>
#elif defined(USE_OPENSSL_MD5)
#include <openssl/md5.h>
@ -84,7 +84,7 @@
#include "curl_memory.h"
#include "memdebug.h"
#if defined(USE_GNUTLS)
#ifdef USE_GNUTLS
typedef struct md5_ctx my_md5_ctx;
@ -177,7 +177,7 @@ static void my_md5_update(void *ctx,
const unsigned char *data,
unsigned int length)
{
#if !defined(HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS)
#ifndef HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS
(void)mbedtls_md5_update(ctx, data, length);
#else
(void)mbedtls_md5_update_ret(ctx, data, length);
@ -186,7 +186,7 @@ static void my_md5_update(void *ctx,
static void my_md5_final(unsigned char *digest, void *ctx)
{
#if !defined(HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS)
#ifndef HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS
(void)mbedtls_md5_finish(ctx, digest);
#else
(void)mbedtls_md5_finish_ret(ctx, digest);

8
lib/multi.c
View file

@ -570,11 +570,11 @@ static void multi_done_locked(struct connectdata *conn,
*/
if((data->set.reuse_forbid
#if defined(USE_NTLM)
#ifdef USE_NTLM
&& !(conn->http_ntlm_state == NTLMSTATE_TYPE2 ||
conn->proxy_ntlm_state == NTLMSTATE_TYPE2)
#endif
#if defined(USE_SPNEGO)
#ifdef USE_SPNEGO
&& !(conn->http_negotiate_state == GSS_AUTHRECV ||
conn->proxy_negotiate_state == GSS_AUTHRECV)
#endif
@ -1154,7 +1154,7 @@ CURLMcode curl_multi_fdset(CURLM *m,
if(!FDSET_SOCK(ps.sockets[i]))
/* pretend it does not exist */
continue;
#if defined(__DJGPP__)
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
@ -1162,7 +1162,7 @@ CURLMcode curl_multi_fdset(CURLM *m,
FD_SET(ps.sockets[i], read_fd_set);
if(ps.actions[i] & CURL_POLL_OUT)
FD_SET(ps.sockets[i], write_fd_set);
#if defined(__DJGPP__)
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
if((int)ps.sockets[i] > this_max_fd)

2
lib/multihandle.h
View file

@ -80,7 +80,7 @@ typedef enum {
#define CURLPIPE_ANY (CURLPIPE_MULTIPLEX)
#if !defined(CURL_DISABLE_SOCKETPAIR)
#ifndef CURL_DISABLE_SOCKETPAIR
#define ENABLE_WAKEUP
#endif

6
lib/rand.c
View file

@ -72,7 +72,7 @@ CURLcode Curl_win32_random(unsigned char *entropy, size_t length)
{
memset(entropy, 0, length);
#if defined(HAVE_WIN_BCRYPTGENRANDOM)
#ifdef HAVE_WIN_BCRYPTGENRANDOM
if(BCryptGenRandom(NULL, entropy, (ULONG)length,
BCRYPT_USE_SYSTEM_PREFERRED_RNG) != STATUS_SUCCESS)
return CURLE_FAILED_INIT;
@ -100,7 +100,7 @@ CURLcode Curl_win32_random(unsigned char *entropy, size_t length)
}
#endif
#if !defined(USE_SSL)
#ifndef USE_SSL
/* ---- possibly non-cryptographic version following ---- */
static CURLcode weak_random(struct Curl_easy *data,
unsigned char *entropy,
@ -119,7 +119,7 @@ static CURLcode weak_random(struct Curl_easy *data,
}
#endif
#if defined(HAVE_ARC4RANDOM)
#ifdef HAVE_ARC4RANDOM
(void)data;
r = (unsigned int)arc4random();
memcpy(entropy, &r, length);

2
lib/rtsp.c
View file

@ -24,7 +24,7 @@
#include "curl_setup.h"
#if !defined(CURL_DISABLE_RTSP)
#ifndef CURL_DISABLE_RTSP
#include "urldata.h"
#include <curl/curl.h>

6
lib/setopt.c
View file

@ -646,7 +646,7 @@ static CURLcode setopt_long(struct Curl_easy *data, CURLoption option,
data->set.postfieldsize = arg;
break;
#ifndef CURL_DISABLE_HTTP
#if !defined(CURL_DISABLE_COOKIES)
#ifndef CURL_DISABLE_COOKIES
case CURLOPT_COOKIESESSION:
/*
* Set this option to TRUE to start a new "cookie session". It will
@ -1778,7 +1778,7 @@ static CURLcode setopt_cptr(struct Curl_easy *data, CURLoption option,
}
return Curl_setstropt(&data->set.str[STRING_ENCODING], ptr);
#if !defined(CURL_DISABLE_AWS)
#ifndef CURL_DISABLE_AWS
case CURLOPT_AWS_SIGV4:
/*
* String that is merged to some authentication
@ -1810,7 +1810,7 @@ static CURLcode setopt_cptr(struct Curl_easy *data, CURLoption option,
*/
return Curl_setstropt(&data->set.str[STRING_USERAGENT], ptr);
#if !defined(CURL_DISABLE_COOKIES)
#ifndef CURL_DISABLE_COOKIES
case CURLOPT_COOKIE:
/*
* Cookie string to send to the remote server in the request.

8
lib/sha256.c
View file

@ -134,7 +134,7 @@ typedef mbedtls_sha256_context my_sha256_ctx;
static CURLcode my_sha256_init(void *ctx)
{
#if !defined(HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS)
#ifndef HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS
(void)mbedtls_sha256_starts(ctx, 0);
#else
(void)mbedtls_sha256_starts_ret(ctx, 0);
@ -146,7 +146,7 @@ static void my_sha256_update(void *ctx,
const unsigned char *data,
unsigned int length)
{
#if !defined(HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS)
#ifndef HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS
(void)mbedtls_sha256_update(ctx, data, length);
#else
(void)mbedtls_sha256_update_ret(ctx, data, length);
@ -155,7 +155,7 @@ static void my_sha256_update(void *ctx,
static void my_sha256_final(unsigned char *digest, void *ctx)
{
#if !defined(HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS)
#ifndef HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS
(void)mbedtls_sha256_finish(ctx, digest);
#else
(void)mbedtls_sha256_finish_ret(ctx, digest);
@ -191,7 +191,7 @@ struct sha256_ctx {
};
typedef struct sha256_ctx my_sha256_ctx;
#if !defined(CALG_SHA_256)
#ifndef CALG_SHA_256
#define CALG_SHA_256 0x0000800c
#endif

3
lib/smb.c
View file

@ -1267,5 +1267,4 @@ static CURLcode smb_parse_url_path(struct Curl_easy *data,
return CURLE_OK;
}
#endif /* CURL_DISABLE_SMB && USE_CURL_NTLM_CORE &&
SIZEOF_CURL_OFF_T > 4 */
#endif /* CURL_DISABLE_SMB && USE_CURL_NTLM_CORE && SIZEOF_CURL_OFF_T > 4 */

5
lib/smb.h
View file

@ -26,12 +26,11 @@
***************************************************************************/
#if !defined(CURL_DISABLE_SMB) && defined(USE_CURL_NTLM_CORE) && \
(SIZEOF_CURL_OFF_T > 4)
(SIZEOF_CURL_OFF_T > 4)
extern const struct Curl_handler Curl_handler_smb;
extern const struct Curl_handler Curl_handler_smbs;
#endif /* CURL_DISABLE_SMB && USE_CURL_NTLM_CORE &&
SIZEOF_CURL_OFF_T > 4 */
#endif /* CURL_DISABLE_SMB && USE_CURL_NTLM_CORE && SIZEOF_CURL_OFF_T > 4 */
#endif /* HEADER_CURL_SMB_H */

2
lib/socks.c
View file

@ -24,7 +24,7 @@
#include "curl_setup.h"
#if !defined(CURL_DISABLE_PROXY)
#ifndef CURL_DISABLE_PROXY
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>

8
lib/url.c
View file

@ -3202,8 +3202,8 @@ static CURLcode parse_connect_to_slist(struct Curl_easy *data,
&as /* to */,
allowed_alpns);
}
#endif
#ifdef USE_HTTP2
#endif
#ifdef USE_HTTP2
if(!hit && (neg->wanted & CURL_HTTP_V2x) &&
!neg->h2_prior_knowledge) {
srcalpnid = ALPN_h2;
@ -3212,7 +3212,7 @@ static CURLcode parse_connect_to_slist(struct Curl_easy *data,
&as /* to */,
allowed_alpns);
}
#endif
#endif
if(!hit && (neg->wanted & CURL_HTTP_V1x) &&
!neg->only_10) {
srcalpnid = ALPN_h1;
@ -4089,7 +4089,7 @@ void Curl_data_priority_clear_state(struct Curl_easy *data)
memset(&data->state.priority, 0, sizeof(data->state.priority));
}
#endif /* defined(USE_HTTP2) || defined(USE_HTTP3) */
#endif /* USE_HTTP2 || USE_HTTP3 */
CURLcode Curl_conn_meta_set(struct connectdata *conn, const char *key,

2
lib/url.h
View file

@ -118,7 +118,7 @@ CURLcode Curl_1st_fatal(CURLcode r1, CURLcode r2);
void Curl_data_priority_clear_state(struct Curl_easy *data);
#else
#define Curl_data_priority_clear_state(x)
#endif /* !(defined(USE_HTTP2) || defined(USE_HTTP3)) */
#endif /* USE_HTTP2 || USE_HTTP3 */
#ifdef USE_NGHTTP2
CURLcode Curl_data_priority_add_child(struct Curl_easy *parent,

10
lib/urldata.h
View file

@ -317,7 +317,7 @@ struct ssl_general_config {
#ifndef CURL_DISABLE_DIGEST_AUTH
/* Struct used for Digest challenge-response authentication */
struct digestdata {
#if defined(USE_WINDOWS_SSPI)
#ifdef USE_WINDOWS_SSPI
BYTE *input_token;
size_t input_token_len;
CtxtHandle *http_context;
@ -745,7 +745,7 @@ struct connectdata {
CtxtHandle *sslContext;
#endif
#if defined(USE_NTLM)
#ifdef USE_NTLM
curlntlm http_ntlm_state;
curlntlm proxy_ntlm_state;
#endif
@ -1052,7 +1052,7 @@ struct UrlState {
struct Curl_async async; /* asynchronous name resolver data */
#endif
#if defined(USE_OPENSSL)
#ifdef USE_OPENSSL
/* void instead of ENGINE to avoid bleeding OpenSSL into this header */
void *engine;
/* void instead of OSSL_PROVIDER */
@ -1254,7 +1254,7 @@ enum dupstring {
STRING_FTP_ALTERNATIVE_TO_USER, /* command to send if USER/PASS fails */
STRING_FTPPORT, /* port to send with the FTP PORT command */
#endif
#if defined(HAVE_GSSAPI)
#ifdef HAVE_GSSAPI
STRING_KRB_LEVEL, /* krb security level */
#endif
#ifndef CURL_DISABLE_NETRC
@ -1619,7 +1619,7 @@ struct UserDefined {
location: */
BIT(opt_no_body); /* as set with CURLOPT_NOBODY */
BIT(verbose); /* output verbosity */
#if defined(HAVE_GSSAPI)
#ifdef HAVE_GSSAPI
BIT(krb); /* Kerberos connection requested */
#endif
BIT(reuse_forbid); /* forbidden to be reused, close after use */

8
lib/vauth/digest_sspi.c
View file

@ -203,7 +203,7 @@ CURLcode Curl_auth_create_digest_md5_message(struct Curl_easy *data,
status == SEC_I_COMPLETE_AND_CONTINUE)
Curl_pSecFn->CompleteAuthToken(&credentials, &resp_desc);
else if(status != SEC_E_OK && status != SEC_I_CONTINUE_NEEDED) {
#if !defined(CURL_DISABLE_VERBOSE_STRINGS)
#ifndef CURL_DISABLE_VERBOSE_STRINGS
char buffer[STRERROR_LEN];
#endif
@ -215,7 +215,7 @@ CURLcode Curl_auth_create_digest_md5_message(struct Curl_easy *data,
if(status == SEC_E_INSUFFICIENT_MEMORY)
return CURLE_OUT_OF_MEMORY;
#if !defined(CURL_DISABLE_VERBOSE_STRINGS)
#ifndef CURL_DISABLE_VERBOSE_STRINGS
infof(data, "schannel: InitializeSecurityContext failed: %s",
Curl_sspi_strerror(status, buffer, sizeof(buffer)));
#endif
@ -602,7 +602,7 @@ CURLcode Curl_auth_create_digest_http_message(struct Curl_easy *data,
status == SEC_I_COMPLETE_AND_CONTINUE)
Curl_pSecFn->CompleteAuthToken(&credentials, &resp_desc);
else if(status != SEC_E_OK && status != SEC_I_CONTINUE_NEEDED) {
#if !defined(CURL_DISABLE_VERBOSE_STRINGS)
#ifndef CURL_DISABLE_VERBOSE_STRINGS
char buffer[STRERROR_LEN];
#endif
@ -616,7 +616,7 @@ CURLcode Curl_auth_create_digest_http_message(struct Curl_easy *data,
if(status == SEC_E_INSUFFICIENT_MEMORY)
return CURLE_OUT_OF_MEMORY;
#if !defined(CURL_DISABLE_VERBOSE_STRINGS)
#ifndef CURL_DISABLE_VERBOSE_STRINGS
infof(data, "schannel: InitializeSecurityContext failed: %s",
Curl_sspi_strerror(status, buffer, sizeof(buffer)));
#endif

2
lib/vauth/krb5_sspi.c
View file

@ -270,7 +270,7 @@ CURLcode Curl_auth_create_gssapi_security_message(struct Curl_easy *data,
SecPkgContext_Sizes sizes;
SECURITY_STATUS status;
#if defined(CURL_DISABLE_VERBOSE_STRINGS)
#ifdef CURL_DISABLE_VERBOSE_STRINGS
(void)data;
#endif

4
lib/vauth/ntlm.c
View file

@ -268,7 +268,7 @@ static CURLcode ntlm_decode_type2_target(struct Curl_easy *data,
const unsigned char *type2 = Curl_bufref_ptr(type2ref);
size_t type2len = Curl_bufref_len(type2ref);
#if defined(CURL_DISABLE_VERBOSE_STRINGS)
#ifdef CURL_DISABLE_VERBOSE_STRINGS
(void)data;
#endif
@ -368,7 +368,7 @@ CURLcode Curl_auth_decode_ntlm_type2_message(struct Curl_easy *data,
const unsigned char *type2 = Curl_bufref_ptr(type2ref);
size_t type2len = Curl_bufref_len(type2ref);
#if defined(CURL_DISABLE_VERBOSE_STRINGS)
#ifdef CURL_DISABLE_VERBOSE_STRINGS
(void)data;
#endif

4
lib/vauth/ntlm_sspi.c
View file

@ -205,7 +205,7 @@ CURLcode Curl_auth_decode_ntlm_type2_message(struct Curl_easy *data,
const struct bufref *type2,
struct ntlmdata *ntlm)
{
#if defined(CURL_DISABLE_VERBOSE_STRINGS)
#ifdef CURL_DISABLE_VERBOSE_STRINGS
(void)data;
#endif
@ -257,7 +257,7 @@ CURLcode Curl_auth_create_ntlm_type3_message(struct Curl_easy *data,
unsigned long attrs;
TimeStamp expiry; /* For Windows 9x compatibility of SSPI calls */
#if defined(CURL_DISABLE_VERBOSE_STRINGS)
#ifdef CURL_DISABLE_VERBOSE_STRINGS
(void)data;
#endif
(void)passwdp;

2
lib/vauth/spnego_sspi.c
View file

@ -107,7 +107,7 @@ CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data,
unsigned long attrs;
TimeStamp expiry; /* For Windows 9x compatibility of SSPI calls */
#if defined(CURL_DISABLE_VERBOSE_STRINGS)
#ifdef CURL_DISABLE_VERBOSE_STRINGS
(void)data;
#endif

2
lib/vauth/vauth.c
View file

@ -54,7 +54,7 @@
*
* Returns a pointer to the newly allocated SPN.
*/
#if !defined(USE_WINDOWS_SSPI)
#ifndef USE_WINDOWS_SSPI
char *Curl_auth_build_spn(const char *service, const char *host,
const char *realm)
{

14
lib/vauth/vauth.h
View file

@ -32,11 +32,11 @@
struct Curl_easy;
struct connectdata;
#if !defined(CURL_DISABLE_DIGEST_AUTH)
#ifndef CURL_DISABLE_DIGEST_AUTH
struct digestdata;
#endif
#if defined(USE_NTLM)
#ifdef USE_NTLM
struct ntlmdata;
#endif
@ -44,7 +44,7 @@ struct ntlmdata;
struct negotiatedata;
#endif
#if defined(USE_GSASL)
#ifdef USE_GSASL
struct gsasldata;
#endif
@ -60,7 +60,7 @@ struct gsasldata;
bool Curl_auth_allowed_to_host(struct Curl_easy *data);
/* This is used to build an SPN string */
#if !defined(USE_WINDOWS_SSPI)
#ifndef USE_WINDOWS_SSPI
char *Curl_auth_build_spn(const char *service, const char *host,
const char *realm);
#else
@ -153,7 +153,7 @@ CURLcode Curl_auth_gsasl_token(struct Curl_easy *data,
void Curl_auth_gsasl_cleanup(struct gsasldata *digest);
#endif
#if defined(USE_NTLM)
#ifdef USE_NTLM
/* meta key for storing NTML meta at connection */
#define CURL_META_NTLM_CONN "meta:auth:ntml:conn"
@ -231,7 +231,7 @@ CURLcode Curl_auth_create_xoauth_bearer_message(const char *user,
const char *bearer,
struct bufref *out);
#if defined(USE_KERBEROS5)
#ifdef USE_KERBEROS5
#ifdef HAVE_GSSAPI
# ifdef HAVE_GSSGNU
@ -250,7 +250,7 @@ CURLcode Curl_auth_create_xoauth_bearer_message(const char *user,
#define CURL_META_KRB5_CONN "meta:auth:krb5:conn"
struct kerberos5data {
#if defined(USE_WINDOWS_SSPI)
#ifdef USE_WINDOWS_SSPI
CredHandle *credentials;
CtxtHandle *context;
TCHAR *spn;

10
lib/version.c
View file

@ -498,7 +498,7 @@ static const struct feat features_table[] = {
!defined(CURL_DISABLE_HTTP)
FEATURE("HTTPS-proxy", https_proxy_present, CURL_VERSION_HTTPS_PROXY),
#endif
#if defined(USE_HTTPSRR)
#ifdef USE_HTTPSRR
FEATURE("HTTPSRR", NULL, 0),
#endif
#if defined(USE_LIBIDN2) || defined(USE_WIN32_IDN) || defined(USE_APPLE_IDN)
@ -523,7 +523,7 @@ static const struct feat features_table[] = {
#ifdef USE_NTLM
FEATURE("NTLM", NULL, CURL_VERSION_NTLM),
#endif
#if defined(USE_LIBPSL)
#ifdef USE_LIBPSL
FEATURE("PSL", NULL, CURL_VERSION_PSL),
#endif
#ifdef USE_SPNEGO
@ -532,7 +532,7 @@ static const struct feat features_table[] = {
#ifdef USE_SSL
FEATURE("SSL", NULL, CURL_VERSION_SSL),
#endif
#if defined(USE_SSLS_EXPORT)
#ifdef USE_SSLS_EXPORT
FEATURE("SSLS-EXPORT", NULL, 0),
#endif
#ifdef USE_WINDOWS_SSPI
@ -607,7 +607,7 @@ curl_version_info_data *curl_version_info(CURLversion stamp)
const struct feat *p;
int features = 0;
#if defined(USE_SSH)
#ifdef USE_SSH
static char ssh_buf[80]; /* 'ssh_buffer' clashes with libssh/libssh.h */
#endif
#ifdef USE_SSL
@ -648,7 +648,7 @@ curl_version_info_data *curl_version_info(CURLversion stamp)
version_info.libidn = idn2_check_version(IDN2_VERSION);
#endif
#if defined(USE_SSH)
#ifdef USE_SSH
Curl_ssh_version(ssh_buf, sizeof(ssh_buf));
version_info.libssh_version = ssh_buf;
#endif

8
lib/vquic/curl_osslq.c
View file

@ -119,15 +119,15 @@ static const char *osslq_SSL_ERROR_to_str(int err)
return "SSL_ERROR_WANT_CONNECT";
case SSL_ERROR_WANT_ACCEPT:
return "SSL_ERROR_WANT_ACCEPT";
#if defined(SSL_ERROR_WANT_ASYNC)
#ifdef SSL_ERROR_WANT_ASYNC
case SSL_ERROR_WANT_ASYNC:
return "SSL_ERROR_WANT_ASYNC";
#endif
#if defined(SSL_ERROR_WANT_ASYNC_JOB)
#ifdef SSL_ERROR_WANT_ASYNC_JOB
case SSL_ERROR_WANT_ASYNC_JOB:
return "SSL_ERROR_WANT_ASYNC_JOB";
#endif
#if defined(SSL_ERROR_WANT_EARLY)
#ifdef SSL_ERROR_WANT_EARLY
case SSL_ERROR_WANT_EARLY:
return "SSL_ERROR_WANT_EARLY";
#endif
@ -514,7 +514,7 @@ static CURLcode cf_osslq_ssl_err(struct Curl_cfilter *cf,
else
err_descr = "SSL certificate verification failed";
}
#if defined(SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED)
#ifdef SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED
/* SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED is only available on
OpenSSL version above v1.1.1, not LibreSSL, BoringSSL, or AWS-LC */
else if((lib == ERR_LIB_SSL) &&

2
lib/vquic/vquic.c
View file

@ -612,7 +612,7 @@ CURLcode vquic_recv_packets(struct Curl_cfilter *cf,
vquic_recv_pkt_cb *recv_cb, void *userp)
{
CURLcode result;
#if defined(HAVE_SENDMMSG)
#ifdef HAVE_SENDMMSG
result = recvmmsg_packets(cf, data, qctx, max_pkts, recv_cb, userp);
#elif defined(HAVE_SENDMSG)
result = recvmsg_packets(cf, data, qctx, max_pkts, recv_cb, userp);

2
lib/vssh/curl_path.c
View file

@ -24,7 +24,7 @@
#include "../curl_setup.h"
#if defined(USE_SSH)
#ifdef USE_SSH
#include "curl_path.h"
#include <curl/curl.h>

6
lib/vssh/ssh.h
View file

@ -26,7 +26,7 @@
#include "../curl_setup.h"
#if defined(USE_LIBSSH2)
#ifdef USE_LIBSSH2
#include <libssh2.h>
#include <libssh2_sftp.h>
#elif defined(USE_LIBSSH)
@ -162,7 +162,7 @@ struct ssh_conn {
int orig_waitfor; /* default READ/WRITE bits wait for */
char *slash_pos; /* used by the SFTP_CREATE_DIRS state */
#if defined(USE_LIBSSH)
#ifdef USE_LIBSSH
CURLcode actualcode; /* the actual error code */
char *readdir_linkPath;
size_t readdir_len;
@ -228,7 +228,7 @@ struct ssh_conn {
#endif
#endif
#if defined(USE_LIBSSH2)
#ifdef USE_LIBSSH2
/* Feature detection based on version numbers to better work with
non-configure platforms */

12
lib/vtls/cipher_suite.c
View file

@ -80,7 +80,7 @@ static const char *cs_txt =
"SHA" "\0"
"SHA256" "\0"
"SHA384" "\0"
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
"ARIA" "\0"
"ARIA128" "\0"
"ARIA256" "\0"
@ -121,7 +121,7 @@ enum {
CS_TXT_IDX_SHA,
CS_TXT_IDX_SHA256,
CS_TXT_IDX_SHA384,
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
CS_TXT_IDX_ARIA,
CS_TXT_IDX_ARIA128,
CS_TXT_IDX_ARIA256,
@ -180,7 +180,7 @@ static const struct cs_entry cs_list [] = {
CS_ENTRY(0xCCA8, ECDHE,RSA,CHACHA20,POLY1305,,,,),
CS_ENTRY(0xCCA9, TLS,ECDHE,ECDSA,WITH,CHACHA20,POLY1305,SHA256,),
CS_ENTRY(0xCCA9, ECDHE,ECDSA,CHACHA20,POLY1305,,,,),
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
CS_ENTRY(0x002F, TLS,RSA,WITH,AES,128,CBC,SHA,),
CS_ENTRY(0x002F, AES128,SHA,,,,,,),
CS_ENTRY(0x0035, TLS,RSA,WITH,AES,256,CBC,SHA,),
@ -234,7 +234,7 @@ static const struct cs_entry cs_list [] = {
CS_ENTRY(0xC032, TLS,ECDH,RSA,WITH,AES,256,GCM,SHA384),
CS_ENTRY(0xC032, ECDH,RSA,AES256,GCM,SHA384,,,),
#endif
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
CS_ENTRY(0x0001, TLS,RSA,WITH,NULL,MD5,,,),
CS_ENTRY(0x0001, NULL,MD5,,,,,,),
CS_ENTRY(0x0002, TLS,RSA,WITH,NULL,SHA,,,),
@ -322,7 +322,7 @@ static const struct cs_entry cs_list [] = {
CS_ENTRY(0xCCAB, TLS,PSK,WITH,CHACHA20,POLY1305,SHA256,,),
CS_ENTRY(0xCCAB, PSK,CHACHA20,POLY1305,,,,,),
#endif
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
CS_ENTRY(0xC09C, TLS,RSA,WITH,AES,128,CCM,,),
CS_ENTRY(0xC09C, AES128,CCM,,,,,,),
CS_ENTRY(0xC09D, TLS,RSA,WITH,AES,256,CCM,,),
@ -340,7 +340,7 @@ static const struct cs_entry cs_list [] = {
CS_ENTRY(0xC0AF, TLS,ECDHE,ECDSA,WITH,AES,256,CCM,8),
CS_ENTRY(0xC0AF, ECDHE,ECDSA,AES256,CCM8,,,,),
#endif
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
/* entries marked ns are "non-standard", they are not in OpenSSL */
CS_ENTRY(0x0041, TLS,RSA,WITH,CAMELLIA,128,CBC,SHA,),
CS_ENTRY(0x0041, CAMELLIA128,SHA,,,,,,),

6
lib/vtls/gtls.c
View file

@ -892,15 +892,15 @@ static CURLcode gtls_client_init(struct Curl_cfilter *cf,
* on QUIC this is common. */
init_flags |= GNUTLS_ENABLE_EARLY_DATA;
#if defined(GNUTLS_FORCE_CLIENT_CERT)
#ifdef GNUTLS_FORCE_CLIENT_CERT
init_flags |= GNUTLS_FORCE_CLIENT_CERT;
#endif
#if defined(GNUTLS_NO_TICKETS_TLS12)
#ifdef GNUTLS_NO_TICKETS_TLS12
init_flags |= GNUTLS_NO_TICKETS_TLS12;
#endif
#if defined(GNUTLS_NO_STATUS_REQUEST)
#ifdef GNUTLS_NO_STATUS_REQUEST
if(!config->verifystatus)
/* Disable the "status_request" TLS extension, enabled by default since
GnuTLS 3.8.0. */

6
lib/vtls/mbedtls.c
View file

@ -880,12 +880,12 @@ mbed_connect_step1(struct Curl_cfilter *cf, struct Curl_easy *data)
}
#if defined(MBEDTLS_SSL_RENEGOTIATION)
#ifdef MBEDTLS_SSL_RENEGOTIATION
mbedtls_ssl_conf_renegotiation(&backend->config,
MBEDTLS_SSL_RENEGOTIATION_ENABLED);
#endif
#if defined(MBEDTLS_SSL_SESSION_TICKETS)
#ifdef MBEDTLS_SSL_SESSION_TICKETS
mbedtls_ssl_conf_session_tickets(&backend->config,
MBEDTLS_SSL_SESSION_TICKETS_DISABLED);
#endif
@ -1426,7 +1426,7 @@ static size_t mbedtls_version(char *buffer, size_t size)
static CURLcode mbedtls_random(struct Curl_easy *data,
unsigned char *entropy, size_t length)
{
#if defined(MBEDTLS_CTR_DRBG_C)
#ifdef MBEDTLS_CTR_DRBG_C
int ret;
mbedtls_entropy_context ctr_entropy;
mbedtls_ctr_drbg_context ctr_drbg;

8
lib/vtls/openssl.c
View file

@ -1124,7 +1124,7 @@ static bool is_pkcs11_uri(const char *string)
#endif
static CURLcode ossl_set_engine(struct Curl_easy *data, const char *engine);
#if defined(OPENSSL_HAS_PROVIDERS)
#ifdef OPENSSL_HAS_PROVIDERS
static CURLcode ossl_set_provider(struct Curl_easy *data,
const char *provider);
#endif
@ -1378,7 +1378,7 @@ int cert_stuff(struct Curl_easy *data,
}
break;
#endif
#if defined(OPENSSL_HAS_PROVIDERS)
#ifdef OPENSSL_HAS_PROVIDERS
/* fall through to compatible provider */
case SSL_FILETYPE_PROVIDER:
{
@ -1631,7 +1631,7 @@ fail:
}
break;
#endif
#if defined(OPENSSL_HAS_PROVIDERS)
#ifdef OPENSSL_HAS_PROVIDERS
/* fall through to compatible provider */
case SSL_FILETYPE_PROVIDER:
{
@ -1967,7 +1967,7 @@ static struct curl_slist *ossl_engines_list(struct Curl_easy *data)
return list;
}
#if defined(OPENSSL_HAS_PROVIDERS)
#ifdef OPENSSL_HAS_PROVIDERS
static void ossl_provider_cleanup(struct Curl_easy *data)
{

6
lib/vtls/rustls.c
View file

@ -583,7 +583,7 @@ init_config_builder(struct Curl_easy *data,
goto cleanup;
}
#if defined(USE_ECH)
#ifdef USE_ECH
if(ECH_ENABLED(data)) {
tls_versions[0] = RUSTLS_TLS_VERSION_TLSV1_3;
tls_versions_len = 1;
@ -918,7 +918,7 @@ cleanup:
return result;
}
#if defined(USE_ECH)
#ifdef USE_ECH
static CURLcode
init_config_builder_ech(struct Curl_easy *data,
const struct ssl_connect_data *connssl,
@ -1077,7 +1077,7 @@ cr_init_backend(struct Curl_cfilter *cf, struct Curl_easy *data,
}
}
#if defined(USE_ECH)
#ifdef USE_ECH
if(ECH_ENABLED(data)) {
result = init_config_builder_ech(data, connssl, config_builder);
if(result != CURLE_OK && data->set.tls_ech & CURLECH_HARD) {

4
lib/vtls/schannel.h
View file

@ -37,7 +37,7 @@
#pragma warning(pop)
#endif
/* Wincrypt must be included before anything that could include OpenSSL. */
#if defined(USE_WIN32_CRYPTO)
#ifdef USE_WIN32_CRYPTO
#include <wincrypt.h>
/* Undefine wincrypt conflicting symbols for BoringSSL. */
#undef X509_NAME
@ -68,7 +68,7 @@
* BoringSSL's <openssl/x509.h>: So just undefine those defines here
* (and only here).
*/
#if defined(OPENSSL_IS_BORINGSSL)
#ifdef OPENSSL_IS_BORINGSSL
# undef X509_NAME
# undef X509_CERT_PAIR
# undef X509_EXTENSIONS

4
lib/vtls/schannel_verify.c
View file

@ -390,7 +390,7 @@ static DWORD cert_get_name_string(struct Curl_easy *data,
BOOL Win8_compat)
{
DWORD actual_length = 0;
#if defined(CURL_WINDOWS_UWP)
#ifdef CURL_WINDOWS_UWP
(void)data;
(void)cert_context;
(void)host_names;
@ -510,7 +510,7 @@ static bool get_alt_name_info(struct Curl_easy *data,
LPDWORD alt_name_info_size)
{
bool result = FALSE;
#if defined(CURL_WINDOWS_UWP)
#ifdef CURL_WINDOWS_UWP
(void)data;
(void)ctx;
(void)alt_name_info;

18
lib/vtls/vtls.c
View file

@ -972,7 +972,7 @@ static const struct Curl_ssl Curl_ssl_multi = {
};
const struct Curl_ssl *Curl_ssl =
#if defined(CURL_WITH_MULTI_SSL)
#ifdef CURL_WITH_MULTI_SSL
&Curl_ssl_multi;
#elif defined(USE_WOLFSSL)
&Curl_ssl_wolfssl;
@ -991,22 +991,22 @@ const struct Curl_ssl *Curl_ssl =
#endif
static const struct Curl_ssl *available_backends[] = {
#if defined(USE_WOLFSSL)
#ifdef USE_WOLFSSL
&Curl_ssl_wolfssl,
#endif
#if defined(USE_GNUTLS)
#ifdef USE_GNUTLS
&Curl_ssl_gnutls,
#endif
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
&Curl_ssl_mbedtls,
#endif
#if defined(USE_OPENSSL)
#ifdef USE_OPENSSL
&Curl_ssl_openssl,
#endif
#if defined(USE_SCHANNEL)
#ifdef USE_SCHANNEL
&Curl_ssl_schannel,
#endif
#if defined(USE_RUSTLS)
#ifdef USE_RUSTLS
&Curl_ssl_rustls,
#endif
NULL
@ -1019,7 +1019,7 @@ void Curl_ssl_cleanup(void)
/* only cleanup if we did a previous init */
if(Curl_ssl->cleanup)
Curl_ssl->cleanup();
#if defined(CURL_WITH_MULTI_SSL)
#ifdef CURL_WITH_MULTI_SSL
Curl_ssl = &Curl_ssl_multi;
#endif
init_ssl = FALSE;
@ -1124,7 +1124,7 @@ CURLsslset Curl_init_sslset_nolock(curl_sslbackend id, const char *name,
return id == Curl_ssl->info.id ||
(name && curl_strequal(name, Curl_ssl->info.name)) ?
CURLSSLSET_OK :
#if defined(CURL_WITH_MULTI_SSL)
#ifdef CURL_WITH_MULTI_SSL
CURLSSLSET_TOO_LATE;
#else
CURLSSLSET_UNKNOWN_BACKEND;

2
lib/vtls/wolfssl.c
View file

@ -178,7 +178,7 @@ wssl_tls13_secret_callback(SSL *ssl, int id, const unsigned char *secret,
Curl_tls_keylog_write(label, client_random, secret, secretSz);
return 0;
}
#endif /* defined(HAVE_SECRET_CALLBACK) && defined(WOLFSSL_TLS13) */
#endif /* HAVE_SECRET_CALLBACK && WOLFSSL_TLS13 */
static void wssl_log_tls12_secret(WOLFSSL *ssl)
{

2
m4/curl-functions.m4
View file

@ -407,7 +407,7 @@ dnl included when bsdsocket.h is to be included.
AC_DEFUN([CURL_INCLUDES_BSDSOCKET], [
curl_includes_bsdsocket="\
/* includes start */
#if defined(HAVE_PROTO_BSDSOCKET_H)
#ifdef HAVE_PROTO_BSDSOCKET_H
# define __NO_NET_API
# define __USE_INLINE__
# include <proto/bsdsocket.h>

2
scripts/schemetable.c
View file

@ -61,7 +61,7 @@ static const struct detail scheme[] = {
{"rtmpts", "#ifdef USE_LIBRTMP" },
{"rtsp", "#ifndef CURL_DISABLE_RTSP" },
{"scp", "#if defined(USE_SSH) && !defined(USE_WOLFSSH)" },
{"sftp", "#if defined(USE_SSH)" },
{"sftp", "#ifdef USE_SSH" },
{"smb", "#if !defined(CURL_DISABLE_SMB) && \\\n"
" defined(USE_CURL_NTLM_CORE) && (SIZEOF_CURL_OFF_T > 4)" },
{"smbs", "#if defined(USE_SSL) && !defined(CURL_DISABLE_SMB) && \\\n"

8
src/tool_cb_rea.c
View file

@ -71,12 +71,12 @@ size_t tool_read_cb(char *buffer, size_t sz, size_t nmemb, void *userdata)
timeout.tv_usec = (int)((wait%1000)*1000);
FD_ZERO(&bits);
#if defined(__DJGPP__)
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(per->infd, &bits);
#if defined(__DJGPP__)
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
if(!select(per->infd + 1, &bits, NULL, NULL, &timeout))
@ -161,12 +161,12 @@ int tool_readbusy_cb(void *clientp,
timeout.tv_usec = 1000;
FD_ZERO(&bits);
#if defined(__DJGPP__)
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(per->infd, &bits);
#if defined(__DJGPP__)
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
select(per->infd + 1, &bits, NULL, NULL, &timeout);

2
src/tool_filetime.c
View file

@ -151,4 +151,4 @@ void setfiletime(curl_off_t filetime, const char *filename,
#endif
}
}
#endif /* defined(HAVE_UTIME) || defined(HAVE_UTIMES) || defined(_WIN32) */
#endif /* HAVE_UTIME || HAVE_UTIMES || _WIN32 */

5
src/tool_filetime.h
View file

@ -30,13 +30,12 @@ struct GlobalConfig;
int getfiletime(const char *filename, struct GlobalConfig *global,
curl_off_t *stamp);
#if defined(HAVE_UTIME) || defined(HAVE_UTIMES) || \
#if defined(HAVE_UTIME) || defined(HAVE_UTIMES) || \
(defined(_WIN32) && (SIZEOF_CURL_OFF_T >= 8))
void setfiletime(curl_off_t filetime, const char *filename,
struct GlobalConfig *global);
#else
#define setfiletime(a,b,c) tool_nop_stmt
#endif /* defined(HAVE_UTIME) || defined(HAVE_UTIMES) || \
(defined(_WIN32) && (SIZEOF_CURL_OFF_T >= 8)) */
#endif
#endif /* HEADER_CURL_TOOL_FILETIME_H */

4
src/tool_main.c
View file

@ -61,8 +61,8 @@
int vms_show = 0;
#endif
#if defined(__AMIGA__)
#if defined(__GNUC__)
#ifdef __AMIGA__
#ifdef __GNUC__
#define CURL_USED __attribute__((used))
#else
#define CURL_USED

2
src/tool_operate.c
View file

@ -2104,7 +2104,7 @@ static CURLcode cacertpaths(struct OperationConfig *config)
#ifdef _WIN32
if(!env) {
#if defined(CURL_CA_SEARCH_SAFE)
#ifdef CURL_CA_SEARCH_SAFE
char *cacert = NULL;
FILE *cafile = tool_execpath("curl-ca-bundle.crt", &cacert);
if(cafile) {

2
tests/http/testenv/mod_curltest/mod_curltest.c
View file

@ -51,7 +51,7 @@ AP_DECLARE_MODULE(curltest) =
NULL, /* func to merge per server config */
NULL, /* command handlers */
curltest_hooks,
#if defined(AP_MODULE_FLAG_NONE)
#ifdef AP_MODULE_FLAG_NONE
AP_MODULE_FLAG_ALWAYS_MERGE
#endif
};

2
tests/libtest/lib1960.c
View file

@ -64,7 +64,7 @@ static int sockopt_cb(void *clientp,
return CURL_SOCKOPT_ALREADY_CONNECTED;
}
#if defined(__AMIGA__)
#ifdef __AMIGA__
#define my_inet_pton(x,y,z) inet_pton(x,(unsigned char *)y,z)
#else
#define my_inet_pton(x,y,z) inet_pton(x,y,z)

2
tests/libtest/lib3207.c
View file

@ -25,7 +25,7 @@
#include "memdebug.h"
#if defined(USE_THREADS_POSIX)
#ifdef USE_THREADS_POSIX
#include <pthread.h>
#endif

4
tests/libtest/lib518.c
View file

@ -471,7 +471,7 @@ test_cleanup:
return res;
}
#else /* defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT) */
#else /* HAVE_GETRLIMIT && HAVE_SETRLIMIT */
static CURLcode test_lib518(char *URL)
{
@ -480,4 +480,4 @@ static CURLcode test_lib518(char *URL)
return TEST_ERR_MAJOR_BAD; /* skip test */
}
#endif /* defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT) */
#endif /* HAVE_GETRLIMIT && HAVE_SETRLIMIT */

4
tests/libtest/lib530.c
View file

@ -235,12 +235,12 @@ static void t530_updateFdSet(struct t530_Sockets *sockets, fd_set* fdset,
{
int i;
for(i = 0; i < sockets->count; ++i) {
#if defined(__DJGPP__)
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(sockets->sockets[i], fdset);
#if defined(__DJGPP__)
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
if(*maxFd < sockets->sockets[i] + 1) {

4
tests/libtest/lib537.c
View file

@ -485,7 +485,7 @@ test_cleanup:
return res;
}
#else /* defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT) */
#else /* HAVE_GETRLIMIT && HAVE_SETRLIMIT */
static CURLcode test_lib537(char *URL)
{
@ -494,4 +494,4 @@ static CURLcode test_lib537(char *URL)
return TEST_ERR_MAJOR_BAD; /* skip test */
}
#endif /* defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT) */
#endif /* HAVE_GETRLIMIT && HAVE_SETRLIMIT */

4
tests/libtest/lib582.c
View file

@ -182,12 +182,12 @@ static void t582_updateFdSet(struct t582_Sockets *sockets, fd_set* fdset,
{
int i;
for(i = 0; i < sockets->count; ++i) {
#if defined(__DJGPP__)
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(sockets->sockets[i], fdset);
#if defined(__DJGPP__)
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
if(*maxFd < sockets->sockets[i] + 1) {

Some files were not shown because too many files have changed in this diff Show more