mirror of
https://github.com/curl/curl.git
synced 2026-04-14 22:31:41 +03:00
tidy-up: miscellaneous
- apply more clang-format. - lib/version: use `CURL_ARRAYSIZE()`. - INSTALL-CMAKE.md: sync-up an option description with others. - examples: delete unused main args. - examples/ftpgetinfo: document `_CRT_SECURE_NO_WARNINGS` symbol. - delete remaining stray duplicate lines. - acinclude.m4: drop an unnecessary x-hack. - vtls/mbedtls: join a URL split into two lines. - src/tool_cb_see: add parentheses around macro expressions. - src/tool_operate: move literals to the right side of comparisons. - libtests: sync up fopen/fstat error messages between tests. - curl_setup.h: replace `if ! defined __LP64` with `ifndef __LP64`. I assume it makes no difference on Tandem systems, as the latter form is already used in `include/curl/system.h`. Closes #20018
This commit is contained in:
parent
cd9da30e76
commit
308c347c8b
53 changed files with 988 additions and 1005 deletions
|
|
@ -741,14 +741,14 @@ struct connectdata {
|
|||
|
||||
#ifndef CURL_DISABLE_PROXY
|
||||
#define CURL_CONN_HOST_DISPNAME(c) \
|
||||
((c)->bits.socksproxy ? (c)->socks_proxy.host.dispname : \
|
||||
(c)->bits.httpproxy ? (c)->http_proxy.host.dispname : \
|
||||
(c)->bits.conn_to_host ? (c)->conn_to_host.dispname : \
|
||||
(c)->host.dispname)
|
||||
((c)->bits.socksproxy ? (c)->socks_proxy.host.dispname : \
|
||||
(c)->bits.httpproxy ? (c)->http_proxy.host.dispname : \
|
||||
(c)->bits.conn_to_host ? (c)->conn_to_host.dispname : \
|
||||
(c)->host.dispname)
|
||||
#else
|
||||
#define CURL_CONN_HOST_DISPNAME(c) \
|
||||
(c)->bits.conn_to_host ? (c)->conn_to_host.dispname : \
|
||||
(c)->host.dispname
|
||||
(c)->bits.conn_to_host ? (c)->conn_to_host.dispname : \
|
||||
(c)->host.dispname
|
||||
#endif
|
||||
|
||||
/* The end of connectdata. */
|
||||
|
|
@ -1162,7 +1162,7 @@ enum dupstring {
|
|||
STRING_SSL_CIPHER_LIST, /* list of ciphers to use */
|
||||
STRING_SSL_CIPHER13_LIST, /* list of TLS 1.3 ciphers to use */
|
||||
STRING_SSL_CRLFILE, /* CRL file to check certificate */
|
||||
STRING_SSL_ISSUERCERT, /* issuer cert file to check certificate */
|
||||
STRING_SSL_ISSUERCERT, /* issuer cert file to check certificate */
|
||||
STRING_SERVICE_NAME, /* Service name */
|
||||
#ifndef CURL_DISABLE_PROXY
|
||||
STRING_CERT_PROXY, /* client certificate filename */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue