From 453d032b26efa803629fe2c90c94d5be6fa3f23d Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Thu, 15 Aug 2024 10:47:37 +0200
Subject: [PATCH] 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
---
 docs/TODO        |  2 +-
 lib/Makefile.mk  |  2 +-
 lib/macos.c      | 28 +++++++++++++---------------
 src/mkhelp.pl    |  1 -
 tests/servers.pm |  2 +-
 5 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/docs/TODO b/docs/TODO
index 6e6747b8c..11e0e4d3d 100644
--- 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 89b7aeb1e..61911d2f1 100644
--- 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 205d30db3..e4662be1d 100644
--- 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 77130a4ce..00f6a22e4 100755
--- 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 d2c60aa6c..5ef0d2fa0 100644
--- 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]);