Merge branch 'upstream-KWSys' into update-kwsys

# By KWSys Upstream
* upstream-KWSys:
  KWSys 2023-01-19 (be3c441e)

Source/kwsys/CONTRIBUTING.rst

@@ -27,7 +27,7 @@ copies of KWSys within dependent projects can be updated to get the changes.
 Code Style
 ==========
 
-We use `clang-format`_ version **6.0** to define our style for C++ code in
+We use `clang-format`_ version **15** to define our style for C++ code in
 the KWSys source tree.  See the `.clang-format`_ configuration file for
 our style settings.  Use the `clang-format.bash`_ script to format source
 code.  It automatically runs ``clang-format`` on the set of source files

Source/kwsys/CommandLineArguments.cxx

@@ -319,7 +319,7 @@ void CommandLineArguments::DeleteRemainingArguments(int argc, char*** argv)
 {
   int cc;
   for (cc = 0; cc < argc; ++cc) {
-    delete[](*argv)[cc];
+    delete[] (*argv)[cc];
   }
   delete[] * argv;
 }

Source/kwsys/Glob.cxx

@@ -390,8 +390,8 @@ bool Glob::FindFiles(const std::string& inexpr, GlobMessages* messages)
 #endif
       // Handle drive letters on Windows
       if (expr[1] == ':' && expr[0] != '/') {
-      skip = 2;
+        skip = 2;
-    }
+      }
   }
 
   if (skip > 0) {

Source/kwsys/ProcessWin32.c

@@ -2406,8 +2406,9 @@ static int kwsysProcess_List__Next_NT4(kwsysProcess_List* self)
 {
   if (self->CurrentInfo) {
     if (self->CurrentInfo->NextEntryDelta > 0) {
-      self->CurrentInfo = ((PSYSTEM_PROCESS_INFORMATION)(
+      self->CurrentInfo =
-        (char*)self->CurrentInfo + self->CurrentInfo->NextEntryDelta));
+        ((PSYSTEM_PROCESS_INFORMATION)((char*)self->CurrentInfo +
+                                       self->CurrentInfo->NextEntryDelta));
       return 1;
     }
     self->CurrentInfo = 0;

Source/kwsys/RegularExpression.cxx

@@ -366,9 +366,9 @@ bool RegularExpression::compile(const char* exp)
   }
 
   // Allocate space.
-  //#ifndef _WIN32
+  // #ifndef _WIN32
   delete[] this->program;
-  //#endif
+  // #endif
   this->program = new char[comp.regsize];
   this->progsize = static_cast<int>(comp.regsize);
 

Source/kwsys/RegularExpression.hxx.in

@@ -456,9 +456,9 @@ inline RegularExpression::RegularExpression(const std::string& s)
  */
 inline RegularExpression::~RegularExpression()
 {
-  //#ifndef _WIN32
+  // #ifndef _WIN32
   delete[] this->program;
-  //#endif
+  // #endif
 }
 
 /**
@@ -556,9 +556,9 @@ inline bool RegularExpression::is_valid() const
 
 inline void RegularExpression::set_invalid()
 {
-  //#ifndef _WIN32
+  // #ifndef _WIN32
   delete[] this->program;
-  //#endif
+  // #endif
   this->program = nullptr;
 }
 

Source/kwsys/kwsysPrivate.h

@@ -27,7 +27,7 @@
 */
 #  define KWSYS_NAMESPACE_STRING KWSYS_NAMESPACE_STRING0(KWSYS_NAMESPACE)
 #  define KWSYS_NAMESPACE_STRING0(x) KWSYS_NAMESPACE_STRING1(x)
-#  define KWSYS_NAMESPACE_STRING1(x) #  x
+#  define KWSYS_NAMESPACE_STRING1(x) #x
 
 #else
 #  error "kwsysPrivate.h included multiple times."

Source/kwsys/testConfigure.cxx

@@ -22,7 +22,7 @@ static bool testFallthrough(int n)
   return r == 2;
 }
 
-int testConfigure(int, char* [])
+int testConfigure(int, char*[])
 {
   bool res = true;
   res = testFallthrough(1) && res;

Source/kwsys/testConsoleBuf.cxx

@@ -743,7 +743,7 @@ static int testConsole()
 
 #endif
 
-int testConsoleBuf(int, char* [])
+int testConsoleBuf(int, char*[])
 {
   int ret = 0;
 

Source/kwsys/testDirectory.cxx

@@ -19,7 +19,7 @@ file Copyright.txt or https://cmake.org/licensing#kwsys for details.  */
 
 #include <testSystemTools.h>
 
-static int _doLongPathTest()
+static int doLongPathTest()
 {
   using namespace kwsys;
   static const int LONG_PATH_THRESHOLD = 512;
@@ -77,7 +77,7 @@ static int _doLongPathTest()
   return res;
 }
 
-static int _nonExistentDirectoryTest()
+static int nonExistentDirectoryTest()
 {
   using namespace kwsys;
   int res = 0;
@@ -105,7 +105,7 @@ static int _nonExistentDirectoryTest()
   return res;
 }
 
-static int _copyDirectoryTest()
+static int copyDirectoryTest()
 {
   using namespace kwsys;
   const std::string source(TEST_SYSTEMTOOLS_BINARY_DIR
@@ -136,8 +136,7 @@ static int _copyDirectoryTest()
   return 0;
 }
 
-int testDirectory(int, char* [])
+int testDirectory(int, char*[])
 {
-  return _doLongPathTest() + _nonExistentDirectoryTest() +
+  return doLongPathTest() + nonExistentDirectoryTest() + copyDirectoryTest();
-    _copyDirectoryTest();
 }

Source/kwsys/testEncoding.cxx

@@ -266,7 +266,7 @@ static int testToWindowsExtendedPath()
 #endif
 }
 
-int testEncoding(int, char* [])
+int testEncoding(int, char*[])
 {
   const char* loc = setlocale(LC_ALL, "");
   if (loc) {

Source/kwsys/testFStream.cxx

@@ -136,7 +136,7 @@ static int testBOMIO()
   return 0;
 }
 
-int testFStream(int, char* [])
+int testFStream(int, char*[])
 {
   int ret = 0;
 

Source/kwsys/testStatus.cxx

@@ -16,7 +16,7 @@ file Copyright.txt or https://cmake.org/licensing#kwsys for details.  */
 #  include <windows.h>
 #endif
 
-int testStatus(int, char* [])
+int testStatus(int, char*[])
 {
   bool res = true;
   {

Source/kwsys/testSystemInformation.cxx

@@ -19,7 +19,7 @@
 #define printMethod3(info, m, unit)                                           \
   std::cout << #m << ": " << info.m << " " << unit << "\n"
 
-int testSystemInformation(int, char* [])
+int testSystemInformation(int, char*[])
 {
   std::cout << "CTEST_FULL_OUTPUT\n"; // avoid truncation
 

Source/kwsys/testSystemTools.cxx

@@ -1209,7 +1209,7 @@ static bool CheckSplitString()
   return ret;
 }
 
-int testSystemTools(int, char* [])
+int testSystemTools(int, char*[])
 {
   bool res = true;