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

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

Closes #14558

diff --git a/docs/TODO b/docs/TODO
index 6e6747b8c770af10230e90c907f97caa9601a8ed..11e0e4d3d94886fa481cb75b36de71cb96150313 100644 (file)
--- a/docs/TODO
+++ b/docs/TODO
@@ -252,7 +252,7 @@
 1.6 thread-safe sharing
 
  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
  users to share data in more powerful ways.
 

diff --git a/lib/Makefile.mk b/lib/Makefile.mk
index 89b7aeb1e7f9c3e206b15499c6d05898b630e596..61911d2f10af3334d01151ac7ec6910c5bce2220 100644 (file)
--- a/lib/Makefile.mk
+++ b/lib/Makefile.mk
@@ -27,7 +27,7 @@
 # Usage:   make -f Makefile.mk CFG=-feat1[-feat2][-feat3][...]
 # 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.
 

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

diff --git a/src/mkhelp.pl b/src/mkhelp.pl
index 77130a4ce3c356755142f4ef41321662f499b1a1..00f6a22e4a40582b162fdc974a59b60272f5f68f 100755 (executable)
--- a/src/mkhelp.pl
+++ b/src/mkhelp.pl
@@ -34,7 +34,6 @@ push @out, "     / __| | | | |_) | |\n";
 push @out, "    | (__| |_| |  _ <| |___\n";
 push @out, "     \\___|\\___/|_| \\_\\_____|\n";
 
-my $olen=0;
 while (<STDIN>) {
     my $line = $_;
     push @out, $line;

diff --git a/tests/servers.pm b/tests/servers.pm
index d2c60aa6c810f35d831591f908ae3c0b5c7652fb..5ef0d2fa003bb379fae739a4ff706e4fa64172e5 100644 (file)
--- a/tests/servers.pm
+++ b/tests/servers.pm
@@ -2323,7 +2323,7 @@ sub responsive_httptls_server {
 sub startservers {
     my @what = @_;
     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) {
         my (@whatlist) = split(/\s+/,$_);
         my $what = lc($whatlist[0]);