mirror of
https://github.com/curl/curl.git
synced 2026-08-25 02:23:31 +03:00
tidy-up: delete, comment or scope C macros reported unused
To reduce the number `-Wunused-macro` compiler warnings: - delete unused macros. - comment out unused macro that are part of a set. - move macros into the scope they are used. This may be useful to enable by default, but there are tricky cases that I didn't manage to fix and paused the effort. E.g. internal features checks in `openssl.c`. There is more, once those are fixed. Closes #16279
This commit is contained in:
Viktor Szakats
parent
edd013326d
commit
784a8ec2c1
36 changed files with 86 additions and 131 deletions
|
|
@ -30,7 +30,9 @@
|
|||
#include "curl_memory.h"
|
||||
#include "memdebug.h"
|
||||
|
||||
#ifdef DEBUGBUILD
|
||||
#define SIGNATURE 0x5c48e9b2 /* Random pattern. */
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Init a bufref struct.
|
||||
|
|
|
|||
|
|
@ -932,15 +932,6 @@ static CURLcode socket_connect_result(struct Curl_easy *data,
|
|||
}
|
||||
}
|
||||
|
||||
/* We have a recv buffer to enhance reads with len < NW_SMALL_READS.
|
||||
* This happens often on TLS connections where the TLS implementation
|
||||
* tries to read the head of a TLS record, determine the length of the
|
||||
* full record and then make a subsequent read for that.
|
||||
* On large reads, we will not fill the buffer to avoid the double copy. */
|
||||
#define NW_RECV_CHUNK_SIZE (64 * 1024)
|
||||
#define NW_RECV_CHUNKS 1
|
||||
#define NW_SMALL_READS (1024)
|
||||
|
||||
struct cf_socket_ctx {
|
||||
int transport;
|
||||
struct Curl_sockaddr_ex addr; /* address to connect to */
|
||||
|
|
|
|||
|
|
@ -65,7 +65,10 @@
|
|||
|
||||
/* allow no more than 5 "chained" compression steps */
|
||||
#define MAX_ENCODE_STACK 5
|
||||
|
||||
#if defined(HAVE_LIBZ) || defined(HAVE_BROTLI) || defined(HAVE_ZSTD)
|
||||
#define DECOMPRESS_BUFFER_SIZE 16384 /* buffer size for decompressed data */
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_LIBZ
|
||||
|
||||
|
|
|
|||
|
|
@ -483,7 +483,9 @@ static bool invalid_octets(const char *p)
|
|||
#define CERR_COMMENT 11 /* a commented line */
|
||||
#define CERR_RANGE 12 /* expire range problem */
|
||||
#define CERR_FIELDS 13 /* incomplete netscape line */
|
||||
#ifdef USE_LIBPSL
|
||||
#define CERR_PSL 14 /* a public suffix */
|
||||
#endif
|
||||
#define CERR_LIVE_WINS 15
|
||||
|
||||
/* The maximum length we accept a date string for the 'expire' keyword. The
|
||||
|
|
|
|||
|
|
@ -144,9 +144,6 @@
|
|||
#include "curl_memory.h"
|
||||
#include "memdebug.h"
|
||||
|
||||
#define NTLMv2_BLOB_SIGNATURE "\x01\x01\x00\x00"
|
||||
#define NTLMv2_BLOB_LEN (44 -16 + ntlm->target_info_len + 4)
|
||||
|
||||
#if !defined(CURL_NTLM_NOT_SUPPORTED)
|
||||
/*
|
||||
* Turns a 56-bit key into being 64-bit wide.
|
||||
|
|
@ -465,6 +462,9 @@ CURLcode Curl_ntlm_core_mk_nt_hash(const char *password,
|
|||
|
||||
#if !defined(USE_WINDOWS_SSPI)
|
||||
|
||||
#define NTLMv2_BLOB_SIGNATURE "\x01\x01\x00\x00"
|
||||
#define NTLMv2_BLOB_LEN (44 -16 + ntlm->target_info_len + 4)
|
||||
|
||||
/* Timestamp in tenths of a microsecond since January 1, 1601 00:00:00 UTC. */
|
||||
struct ms_filetime {
|
||||
unsigned int dwLowDateTime;
|
||||
|
|
@ -626,7 +626,7 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_resp(unsigned char *ntlmv2hash,
|
|||
/* Concatenate the Type 2 challenge with the BLOB and do HMAC MD5 */
|
||||
memcpy(ptr + 8, &ntlm->nonce[0], 8);
|
||||
result = Curl_hmacit(&Curl_HMAC_MD5, ntlmv2hash, HMAC_MD5_LENGTH, ptr + 8,
|
||||
NTLMv2_BLOB_LEN + 8, hmac_output);
|
||||
NTLMv2_BLOB_LEN + 8, hmac_output);
|
||||
if(result) {
|
||||
free(ptr);
|
||||
return result;
|
||||
|
|
|
|||
|
|
@ -82,7 +82,6 @@
|
|||
# include <nettle/sha.h>
|
||||
# if defined(SHA512_256_DIGEST_SIZE)
|
||||
# define USE_GNUTLS_SHA512_256 1
|
||||
# define HAS_SHA512_256_IMPLEMENTATION 1
|
||||
# endif
|
||||
#endif /* ! HAS_SHA512_256_IMPLEMENTATION && USE_GNUTLS */
|
||||
|
||||
|
|
@ -269,9 +268,6 @@ Curl_sha512_256_finish(unsigned char *digest,
|
|||
|
||||
#else /* No system or TLS backend SHA-512/256 implementation available */
|
||||
|
||||
/* Use local implementation */
|
||||
#define HAS_SHA512_256_IMPLEMENTATION 1
|
||||
|
||||
/* ** This implementation of SHA-512/256 hash calculation was originally ** *
|
||||
* ** written by Evgeny Grin (Karlson2k) for GNU libmicrohttpd. ** *
|
||||
* ** The author ported the code to libcurl. The ported code is provided ** *
|
||||
|
|
|
|||
|
|
@ -46,9 +46,6 @@
|
|||
|
||||
#define DNS_CLASS_IN 0x01
|
||||
|
||||
/* doh_print_buf truncates if the hex string will be more than this */
|
||||
#define LOCAL_PB_HEXMAX 400
|
||||
|
||||
#ifndef CURL_DISABLE_VERBOSE_STRINGS
|
||||
static const char * const errors[]={
|
||||
"",
|
||||
|
|
@ -192,6 +189,10 @@ doh_write_cb(char *contents, size_t size, size_t nmemb, void *userp)
|
|||
}
|
||||
|
||||
#if defined(USE_HTTPSRR) && defined(DEBUGBUILD)
|
||||
|
||||
/* doh_print_buf truncates if the hex string will be more than this */
|
||||
#define LOCAL_PB_HEXMAX 400
|
||||
|
||||
static void doh_print_buf(struct Curl_easy *data,
|
||||
const char *prefix,
|
||||
unsigned char *buf, size_t len)
|
||||
|
|
|
|||
|
|
@ -32,7 +32,9 @@
|
|||
|
||||
#define MIN_FIRST_ALLOC 32
|
||||
|
||||
#ifdef DEBUGBUILD
|
||||
#define DYNINIT 0xbee51da /* random pattern */
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Init a dynbuf struct.
|
||||
|
|
|
|||
|
|
@ -34,8 +34,10 @@
|
|||
#include "memdebug.h"
|
||||
|
||||
/* random patterns for API verification */
|
||||
#ifdef DEBUGBUILD
|
||||
#define HASHINIT 0x7017e781
|
||||
#define ITERINIT 0x5FEDCBA9
|
||||
#endif
|
||||
|
||||
static void
|
||||
hash_element_dtor(void *user, void *element)
|
||||
|
|
|
|||
|
|
@ -33,8 +33,6 @@
|
|||
* https://www.innovation.ch/java/ntlm.html
|
||||
*/
|
||||
|
||||
#define DEBUG_ME 0
|
||||
|
||||
#include "urldata.h"
|
||||
#include "sendf.h"
|
||||
#include "strcase.h"
|
||||
|
|
@ -55,12 +53,6 @@
|
|||
#include "curl_memory.h"
|
||||
#include "memdebug.h"
|
||||
|
||||
#if DEBUG_ME
|
||||
# define DEBUG_OUT(x) x
|
||||
#else
|
||||
# define DEBUG_OUT(x) Curl_nop_stmt
|
||||
#endif
|
||||
|
||||
CURLcode Curl_input_ntlm(struct Curl_easy *data,
|
||||
bool proxy, /* if proxy or not */
|
||||
const char *header) /* rest of the www-authenticate:
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
#include "curl_printf.h"
|
||||
|
||||
#define IN6ADDRSZ 16
|
||||
#define INADDRSZ 4
|
||||
/* #define INADDRSZ 4 */
|
||||
#define INT16SZ 2
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -32,12 +32,11 @@
|
|||
/* this must be the last include file */
|
||||
#include "memdebug.h"
|
||||
|
||||
#ifdef DEBUGBUILD
|
||||
#define LLISTINIT 0x100cc001 /* random pattern */
|
||||
#define NODEINIT 0x12344321 /* random pattern */
|
||||
#define NODEREM 0x54321012 /* random pattern */
|
||||
|
||||
|
||||
#ifdef DEBUGBUILD
|
||||
#define VERIFYNODE(x) verifynode(x)
|
||||
static struct Curl_llist_node *verifynode(struct Curl_llist_node *n)
|
||||
{
|
||||
|
|
|
|||
10
lib/mqtt.c
10
lib/mqtt.c
|
|
@ -46,11 +46,11 @@
|
|||
/* The last #include file should be: */
|
||||
#include "memdebug.h"
|
||||
|
||||
#define MQTT_MSG_CONNECT 0x10
|
||||
#define MQTT_MSG_CONNACK 0x20
|
||||
#define MQTT_MSG_PUBLISH 0x30
|
||||
#define MQTT_MSG_SUBSCRIBE 0x82
|
||||
#define MQTT_MSG_SUBACK 0x90
|
||||
#define MQTT_MSG_CONNECT 0x10
|
||||
/* #define MQTT_MSG_CONNACK 0x20 */
|
||||
#define MQTT_MSG_PUBLISH 0x30
|
||||
#define MQTT_MSG_SUBSCRIBE 0x82
|
||||
#define MQTT_MSG_SUBACK 0x90
|
||||
#define MQTT_MSG_DISCONNECT 0xe0
|
||||
|
||||
#define MQTT_CONNACK_LEN 2
|
||||
|
|
|
|||
|
|
@ -26,10 +26,14 @@
|
|||
#ifndef CURL_DISABLE_NETRC
|
||||
|
||||
#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
|
||||
|
||||
#include <curl/curl.h>
|
||||
#include "netrc.h"
|
||||
|
|
|
|||
|
|
@ -100,7 +100,9 @@ static int parsedate(const char *date, time_t *output);
|
|||
#define PARSEDATE_OK 0
|
||||
#define PARSEDATE_FAIL -1
|
||||
#define PARSEDATE_LATER 1
|
||||
#if defined(HAVE_TIME_T_UNSIGNED) || (SIZEOF_TIME_T < 5)
|
||||
#define PARSEDATE_SOONER 2
|
||||
#endif
|
||||
|
||||
#if !defined(CURL_DISABLE_PARSEDATE) || !defined(CURL_DISABLE_FTP) || \
|
||||
!defined(CURL_DISABLE_FILE)
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@
|
|||
|
||||
#define SMB_FLAGS_CANONICAL_PATHNAMES 0x10
|
||||
#define SMB_FLAGS_CASELESS_PATHNAMES 0x08
|
||||
#define SMB_FLAGS2_UNICODE_STRINGS 0x8000
|
||||
/* #define SMB_FLAGS2_UNICODE_STRINGS 0x8000 */
|
||||
#define SMB_FLAGS2_IS_LONG_NAME 0x0040
|
||||
#define SMB_FLAGS2_KNOWS_LONG_NAME 0x0001
|
||||
|
||||
|
|
|
|||
|
|
@ -836,8 +836,6 @@ static bool ssh_config_matches(struct connectdata *one,
|
|||
return Curl_safecmp(one->proto.sshc.rsa, two->proto.sshc.rsa) &&
|
||||
Curl_safecmp(one->proto.sshc.rsa_pub, two->proto.sshc.rsa_pub);
|
||||
}
|
||||
#else
|
||||
#define ssh_config_matches(x,y) FALSE
|
||||
#endif
|
||||
|
||||
struct url_conn_match {
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@
|
|||
#include "curl_memory.h"
|
||||
#include "memdebug.h"
|
||||
|
||||
#ifndef USE_WINDOWS_SSPI
|
||||
#define SESSION_ALGO 1 /* for algos with this bit set */
|
||||
|
||||
#define ALGO_MD5 0
|
||||
|
|
@ -59,7 +60,6 @@
|
|||
#define ALGO_SHA512_256 4
|
||||
#define ALGO_SHA512_256SESS (ALGO_SHA512_256 | SESSION_ALGO)
|
||||
|
||||
#if !defined(USE_WINDOWS_SSPI)
|
||||
#define DIGEST_QOP_VALUE_AUTH (1 << 0)
|
||||
#define DIGEST_QOP_VALUE_AUTH_INT (1 << 1)
|
||||
#define DIGEST_QOP_VALUE_AUTH_CONF (1 << 2)
|
||||
|
|
@ -141,8 +141,8 @@ bool Curl_auth_digest_get_pair(const char *str, char *value, char *content,
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
#if !defined(USE_WINDOWS_SSPI)
|
||||
/* Convert md5 chunk to RFC2617 (section 3.1.3) -suitable ASCII string */
|
||||
#ifndef USE_WINDOWS_SSPI
|
||||
/* Convert MD5 chunk to RFC2617 (section 3.1.3) -suitable ASCII string */
|
||||
static void auth_digest_md5_to_ascii(unsigned char *source, /* 16 bytes */
|
||||
unsigned char *dest) /* 33 bytes */
|
||||
{
|
||||
|
|
|
|||
|
|
@ -422,8 +422,6 @@ static int idn_present(curl_version_info_data *info)
|
|||
return info->libidn != NULL;
|
||||
#endif
|
||||
}
|
||||
#else
|
||||
#define idn_present NULL
|
||||
#endif
|
||||
|
||||
#if defined(USE_SSL) && !defined(CURL_DISABLE_PROXY) && \
|
||||
|
|
|
|||
|
|
@ -151,13 +151,6 @@
|
|||
#define CONST_EXTS const
|
||||
#define HAVE_ERR_REMOVE_THREAD_STATE_DEPRECATED 1
|
||||
|
||||
/* funny typecast define due to difference in API */
|
||||
#ifdef LIBRESSL_VERSION_NUMBER
|
||||
#define ARG2_X509_signature_print (X509_ALGOR *)
|
||||
#else
|
||||
#define ARG2_X509_signature_print
|
||||
#endif
|
||||
|
||||
#else
|
||||
/* For OpenSSL before 1.1.0 */
|
||||
#define ASN1_STRING_get0_data(x) ASN1_STRING_data(x)
|
||||
|
|
@ -850,14 +843,6 @@ static void ossl_bio_cf_method_free(BIO_METHOD *m)
|
|||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* Number of bytes to read from the random number seed file. This must be
|
||||
* a finite value (because some entropy "files" like /dev/urandom have
|
||||
* an infinite length), but must be large enough to provide enough
|
||||
* entropy to properly seed OpenSSL's PRNG.
|
||||
*/
|
||||
#define RAND_LOAD_LENGTH 1024
|
||||
|
||||
#ifdef HAVE_KEYLOG_CALLBACK
|
||||
static void ossl_keylog_callback(const SSL *ssl, const char *line)
|
||||
{
|
||||
|
|
@ -1042,6 +1027,14 @@ static CURLcode ossl_seed(struct Curl_easy *data)
|
|||
RAND_add(randb, (int)len, (double)len/2);
|
||||
} while(!rand_enough());
|
||||
|
||||
/*
|
||||
* Number of bytes to read from the random number seed file. This must be
|
||||
* a finite value (because some entropy "files" like /dev/urandom have
|
||||
* an infinite length), but must be large enough to provide enough
|
||||
* entropy to properly seed OpenSSL's PRNG.
|
||||
*/
|
||||
# define RAND_LOAD_LENGTH 1024
|
||||
|
||||
{
|
||||
/* generates a default path for the random seed file */
|
||||
char fname[256];
|
||||
|
|
|
|||
|
|
@ -80,10 +80,6 @@
|
|||
# define HAS_ALPN_SCHANNEL
|
||||
#endif
|
||||
|
||||
#ifndef BCRYPT_CHACHA20_POLY1305_ALGORITHM
|
||||
#define BCRYPT_CHACHA20_POLY1305_ALGORITHM L"CHACHA20_POLY1305"
|
||||
#endif
|
||||
|
||||
#ifndef BCRYPT_CHAIN_MODE_CCM
|
||||
#define BCRYPT_CHAIN_MODE_CCM L"ChainingModeCCM"
|
||||
#endif
|
||||
|
|
@ -232,8 +228,6 @@ schannel_set_ssl_version_min_max(DWORD *enabled_protocols,
|
|||
return CURLE_OK;
|
||||
}
|
||||
|
||||
/* longest is 26, buffer is slightly bigger */
|
||||
#define LONGEST_ALG_ID 32
|
||||
#define CIPHEROPTION(x) {#x, x}
|
||||
|
||||
struct algo {
|
||||
|
|
|
|||
|
|
@ -28,14 +28,14 @@
|
|||
defined(USE_SCHANNEL) || defined(USE_SECTRANSP) || \
|
||||
defined(USE_MBEDTLS)
|
||||
|
||||
#if defined(USE_WOLFSSL) || defined(USE_SCHANNEL)
|
||||
#if defined(USE_GNUTLS) || defined(USE_SCHANNEL) || defined(USE_SECTRANSP) || \
|
||||
defined(USE_MBEDTLS) || defined(USE_WOLFSSL)
|
||||
#define WANT_PARSEX509 /* uses Curl_parseX509() */
|
||||
#endif
|
||||
|
||||
#if defined(USE_GNUTLS) || defined(USE_SCHANNEL) || defined(USE_SECTRANSP) || \
|
||||
defined(USE_MBEDTLS)
|
||||
#define WANT_EXTRACT_CERTINFO /* uses Curl_extract_certinfo() */
|
||||
#define WANT_PARSEX509 /* ... uses Curl_parseX509() */
|
||||
#endif
|
||||
|
||||
#include <curl/curl.h>
|
||||
|
|
@ -64,10 +64,10 @@
|
|||
#define CURL_ASN1_MAX ((size_t) 0x40000) /* 256K */
|
||||
|
||||
/* ASN.1 classes. */
|
||||
#define CURL_ASN1_UNIVERSAL 0
|
||||
#define CURL_ASN1_APPLICATION 1
|
||||
#define CURL_ASN1_CONTEXT_SPECIFIC 2
|
||||
#define CURL_ASN1_PRIVATE 3
|
||||
/* #define CURL_ASN1_UNIVERSAL 0 */
|
||||
/* #define CURL_ASN1_APPLICATION 1 */
|
||||
/* #define CURL_ASN1_CONTEXT_SPECIFIC 2 */
|
||||
/* #define CURL_ASN1_PRIVATE 3 */
|
||||
|
||||
/* ASN.1 types. */
|
||||
#define CURL_ASN1_BOOLEAN 1
|
||||
|
|
@ -76,27 +76,27 @@
|
|||
#define CURL_ASN1_OCTET_STRING 4
|
||||
#define CURL_ASN1_NULL 5
|
||||
#define CURL_ASN1_OBJECT_IDENTIFIER 6
|
||||
#define CURL_ASN1_OBJECT_DESCRIPTOR 7
|
||||
#define CURL_ASN1_INSTANCE_OF 8
|
||||
#define CURL_ASN1_REAL 9
|
||||
/* #define CURL_ASN1_OBJECT_DESCRIPTOR 7 */
|
||||
/* #define CURL_ASN1_INSTANCE_OF 8 */
|
||||
/* #define CURL_ASN1_REAL 9 */
|
||||
#define CURL_ASN1_ENUMERATED 10
|
||||
#define CURL_ASN1_EMBEDDED 11
|
||||
/* #define CURL_ASN1_EMBEDDED 11 */
|
||||
#define CURL_ASN1_UTF8_STRING 12
|
||||
#define CURL_ASN1_RELATIVE_OID 13
|
||||
#define CURL_ASN1_SEQUENCE 16
|
||||
#define CURL_ASN1_SET 17
|
||||
/* #define CURL_ASN1_RELATIVE_OID 13 */
|
||||
/* #define CURL_ASN1_SEQUENCE 16 */
|
||||
/* #define CURL_ASN1_SET 17 */
|
||||
#define CURL_ASN1_NUMERIC_STRING 18
|
||||
#define CURL_ASN1_PRINTABLE_STRING 19
|
||||
#define CURL_ASN1_TELETEX_STRING 20
|
||||
#define CURL_ASN1_VIDEOTEX_STRING 21
|
||||
/* #define CURL_ASN1_VIDEOTEX_STRING 21 */
|
||||
#define CURL_ASN1_IA5_STRING 22
|
||||
#define CURL_ASN1_UTC_TIME 23
|
||||
#define CURL_ASN1_GENERALIZED_TIME 24
|
||||
#define CURL_ASN1_GRAPHIC_STRING 25
|
||||
/* #define CURL_ASN1_GRAPHIC_STRING 25 */
|
||||
#define CURL_ASN1_VISIBLE_STRING 26
|
||||
#define CURL_ASN1_GENERAL_STRING 27
|
||||
/* #define CURL_ASN1_GENERAL_STRING 27 */
|
||||
#define CURL_ASN1_UNIVERSAL_STRING 28
|
||||
#define CURL_ASN1_CHARACTER_STRING 29
|
||||
/* #define CURL_ASN1_CHARACTER_STRING 29 */
|
||||
#define CURL_ASN1_BMP_STRING 30
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -45,19 +45,13 @@
|
|||
#include <limits.h>
|
||||
|
||||
#define CURL_MASK_UCHAR ((unsigned char)~0)
|
||||
#define CURL_MASK_SCHAR (CURL_MASK_UCHAR >> 1)
|
||||
|
||||
#define CURL_MASK_USHORT ((unsigned short)~0)
|
||||
#define CURL_MASK_SSHORT (CURL_MASK_USHORT >> 1)
|
||||
|
||||
#define CURL_MASK_UINT ((unsigned int)~0)
|
||||
#define CURL_MASK_SINT (CURL_MASK_UINT >> 1)
|
||||
|
||||
#define CURL_MASK_ULONG ((unsigned long)~0)
|
||||
#define CURL_MASK_SLONG (CURL_MASK_ULONG >> 1)
|
||||
|
||||
#define CURL_MASK_UCOFFT ((unsigned CURL_TYPEOF_CURL_OFF_T)~0)
|
||||
#define CURL_MASK_SCOFFT (CURL_MASK_UCOFFT >> 1)
|
||||
|
||||
#define CURL_MASK_USIZE_T ((size_t)~0)
|
||||
#define CURL_MASK_SSIZE_T (CURL_MASK_USIZE_T >> 1)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue