romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 11:03:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

tidy-up: miscellaneous

Browse source 
- 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:
Viktor Szakats 2025-12-12 20:51:52 +01:00
parent cd9da30e76
commit 308c347c8b
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
53 changed files with 988 additions and 1005 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/tool_libinfo.c
View file

@ -61,7 +61,7 @@ static struct proto_name_tokenp {
{ "scp", &proto_scp },
{ "sftp", &proto_sftp },
{ "tftp", &proto_tftp },
{ NULL, NULL }
{ NULL, NULL }
};
bool feature_altsvc = FALSE;
@ -87,38 +87,38 @@ static struct feature_name_presentp {
int feature_bitmask;
} const maybe_feature[] = {
/* Keep alphabetically sorted. */
{"alt-svc", &feature_altsvc, CURL_VERSION_ALTSVC},
{"AsynchDNS", NULL, CURL_VERSION_ASYNCHDNS},
{"brotli", &feature_brotli, CURL_VERSION_BROTLI},
{"CharConv", NULL, CURL_VERSION_CONV},
{"Debug", NULL, CURL_VERSION_DEBUG},
{"ECH", &feature_ech, 0},
{"gsasl", NULL, CURL_VERSION_GSASL},
{"GSS-API", NULL, CURL_VERSION_GSSAPI},
{"HSTS", &feature_hsts, CURL_VERSION_HSTS},
{"HTTP2", &feature_http2, CURL_VERSION_HTTP2},
{"HTTP3", &feature_http3, CURL_VERSION_HTTP3},
{"HTTPS-proxy", &feature_httpsproxy, CURL_VERSION_HTTPS_PROXY},
{"IDN", NULL, CURL_VERSION_IDN},
{"IPv6", NULL, CURL_VERSION_IPV6},
{"Kerberos", NULL, CURL_VERSION_KERBEROS5},
{"Largefile", NULL, CURL_VERSION_LARGEFILE},
{"libz", &feature_libz, CURL_VERSION_LIBZ},
{"MultiSSL", NULL, CURL_VERSION_MULTI_SSL},
{"NTLM", &feature_ntlm, CURL_VERSION_NTLM},
{"NTLM_WB", &feature_ntlm_wb, CURL_VERSION_NTLM_WB},
{"PSL", NULL, CURL_VERSION_PSL},
{"SPNEGO", &feature_spnego, CURL_VERSION_SPNEGO},
{"SSL", &feature_ssl, CURL_VERSION_SSL},
{"SSPI", NULL, CURL_VERSION_SSPI},
{"SSLS-EXPORT", &feature_ssls_export, 0},
{"threadsafe", NULL, CURL_VERSION_THREADSAFE},
{"TLS-SRP", &feature_tls_srp, CURL_VERSION_TLSAUTH_SRP},
{"TrackMemory", NULL, CURL_VERSION_CURLDEBUG},
{"Unicode", NULL, CURL_VERSION_UNICODE},
{"UnixSockets", NULL, CURL_VERSION_UNIX_SOCKETS},
{"zstd", &feature_zstd, CURL_VERSION_ZSTD},
{NULL, NULL, 0}
{ "alt-svc", &feature_altsvc, CURL_VERSION_ALTSVC },
{ "AsynchDNS", NULL, CURL_VERSION_ASYNCHDNS },
{ "brotli", &feature_brotli, CURL_VERSION_BROTLI },
{ "CharConv", NULL, CURL_VERSION_CONV },
{ "Debug", NULL, CURL_VERSION_DEBUG },
{ "ECH", &feature_ech, 0 },
{ "gsasl", NULL, CURL_VERSION_GSASL },
{ "GSS-API", NULL, CURL_VERSION_GSSAPI },
{ "HSTS", &feature_hsts, CURL_VERSION_HSTS },
{ "HTTP2", &feature_http2, CURL_VERSION_HTTP2 },
{ "HTTP3", &feature_http3, CURL_VERSION_HTTP3 },
{ "HTTPS-proxy", &feature_httpsproxy, CURL_VERSION_HTTPS_PROXY },
{ "IDN", NULL, CURL_VERSION_IDN },
{ "IPv6", NULL, CURL_VERSION_IPV6 },
{ "Kerberos", NULL, CURL_VERSION_KERBEROS5 },
{ "Largefile", NULL, CURL_VERSION_LARGEFILE },
{ "libz", &feature_libz, CURL_VERSION_LIBZ },
{ "MultiSSL", NULL, CURL_VERSION_MULTI_SSL },
{ "NTLM", &feature_ntlm, CURL_VERSION_NTLM },
{ "NTLM_WB", &feature_ntlm_wb, CURL_VERSION_NTLM_WB },
{ "PSL", NULL, CURL_VERSION_PSL },
{ "SPNEGO", &feature_spnego, CURL_VERSION_SPNEGO },
{ "SSL", &feature_ssl, CURL_VERSION_SSL },
{ "SSPI", NULL, CURL_VERSION_SSPI },
{ "SSLS-EXPORT", &feature_ssls_export, 0 },
{ "threadsafe", NULL, CURL_VERSION_THREADSAFE },
{ "TLS-SRP", &feature_tls_srp, CURL_VERSION_TLSAUTH_SRP },
{ "TrackMemory", NULL, CURL_VERSION_CURLDEBUG },
{ "Unicode", NULL, CURL_VERSION_UNICODE },
{ "UnixSockets", NULL, CURL_VERSION_UNIX_SOCKETS },
{ "zstd", &feature_zstd, CURL_VERSION_ZSTD },
{ NULL, NULL, 0 }
};
static const char *fnames[CURL_ARRAYSIZE(maybe_feature)];
@ -186,7 +186,7 @@ CURLcode get_libcurl_info(void)
}
feature_libssh2 = curlinfo->libssh_version &&
!strncmp("libssh2", curlinfo->libssh_version, 7);
!strncmp("libssh2", curlinfo->libssh_version, 7);
return CURLE_OK;
}