luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tidy-up: misc build, tests, lib/macos.c

Browse Source 
- mkhelp.pl: drop unused assigment.
- Makefile.mk: update a comment.
- lib/macos.c: delete redundant block.
- fix two typos.

Closes #14558
This commit is contained in:
Viktor Szakats 2024-08-15 10:47:37 +02:00
parent 471b11a9fd
commit 453d032b26
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
5 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/TODO
View File

@ -252,7 +252,7 @@
1.6 thread-safe sharing 1.6 thread-safe sharing
Using the share interface users can share some data between easy handles but Using the share interface users can share some data between easy handles but
several of the sharing options are documented as as not safe and supported to several of the sharing options are documented as not safe and supported to
share between multiple concurrent threads. Fixing this would enable more share between multiple concurrent threads. Fixing this would enable more
users to share data in more powerful ways. users to share data in more powerful ways.

2
lib/Makefile.mk
View File

@ -27,7 +27,7 @@
# Usage: make -f Makefile.mk CFG=-feat1[-feat2][-feat3][...] # Usage: make -f Makefile.mk CFG=-feat1[-feat2][-feat3][...]
# Example: make -f Makefile.mk CFG=-zlib-ssl-libssh2-ipv6 # Example: make -f Makefile.mk CFG=-zlib-ssl-libssh2-ipv6
# #
# Look for ' ?=' to find all accepted customization variables. # Look for ' ?=' to find accepted customization variables.
# This script is reused by 'src' and 'docs/examples' Makefile.mk scripts. # This script is reused by 'src' and 'docs/examples' Makefile.mk scripts.

28
lib/macos.c
View File

@ -34,21 +34,19 @@
CURLcode Curl_macos_init(void) CURLcode Curl_macos_init(void)
{ {
{ /*
/* * The automagic conversion from IPv4 literals to IPv6 literals only
* The automagic conversion from IPv4 literals to IPv6 literals only * works if the SCDynamicStoreCopyProxies system function gets called
* works if the SCDynamicStoreCopyProxies system function gets called * first. As Curl currently does not support system-wide HTTP proxies, we
* first. As Curl currently does not support system-wide HTTP proxies, we * therefore do not use any value this function might return.
* therefore do not use any value this function might return. *
* * This function is only available on macOS and is not needed for
* This function is only available on macOS and is not needed for * IPv4-only builds, hence the conditions for defining
* IPv4-only builds, hence the conditions for defining * CURL_MACOS_CALL_COPYPROXIES in curl_setup.h.
* CURL_MACOS_CALL_COPYPROXIES in curl_setup.h. */
*/ CFDictionaryRef dict = SCDynamicStoreCopyProxies(NULL);
CFDictionaryRef dict = SCDynamicStoreCopyProxies(NULL); if(dict)
if(dict) CFRelease(dict);
CFRelease(dict);
}
return CURLE_OK; return CURLE_OK;
} }

1
src/mkhelp.pl
View File

@ -34,7 +34,6 @@ push @out, " / __| | | | |_) | |\n";
push @out, " | (__| |_| | _ <| |___\n"; push @out, " | (__| |_| | _ <| |___\n";
push @out, " \\___|\\___/|_| \\_\\_____|\n"; push @out, " \\___|\\___/|_| \\_\\_____|\n";
my $olen=0;
while (<STDIN>) { while (<STDIN>) {
my $line = $_; my $line = $_;
push @out, $line; push @out, $line;

2
tests/servers.pm
View File

@ -2323,7 +2323,7 @@ sub responsive_httptls_server {
sub startservers { sub startservers {
my @what = @_; my @what = @_;
my ($pid, $pid2); my ($pid, $pid2);
my $serr; # error while starting a server (as as the return enumerations) my $serr; # error while starting a server (as of the return enumerations)
for(@what) { for(@what) {
my (@whatlist) = split(/\s+/,$_); my (@whatlist) = split(/\s+/,$_);
my $what = lc($whatlist[0]); my $what = lc($whatlist[0]);