romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-24 19:03:40 +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

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