From 4ac17cff4207646f58b473509b73991c94564d7e Mon Sep 17 00:00:00 2001 From: KWSys Upstream Date: Thu, 19 Jan 2023 09:11:15 -0500 Subject: KWSys 2023-01-19 (be3c441e) Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit be3c441e46e091a7606565221bb5ae7c9a9b684f (master). Upstream Shortlog ----------------- Brad King (4): 6c66ba9e clang-format.bash: Use generic clang-format attribute 82ae3f28 clang-format.bash: update to clang-format-15 a61d0ad6 Empty commit at end of history preceding clang-format-15 style transition 3cb35bf3 CONTRIBUTING: Update documented clang-format version to 15 Kitware Robot (1): f685d817 Revise C++ coding style using clang-format-15 Sean McBride (1): d6c6fd82 testDirectory: Rename functions to fix -Wreserved-identifier warnings --- CONTRIBUTING.rst | 2 +- CommandLineArguments.cxx | 2 +- Glob.cxx | 4 ++-- ProcessWin32.c | 5 +++-- RegularExpression.cxx | 4 ++-- RegularExpression.hxx.in | 8 ++++---- kwsysPrivate.h | 2 +- testConfigure.cxx | 2 +- testConsoleBuf.cxx | 2 +- testDirectory.cxx | 11 +++++------ testEncoding.cxx | 2 +- testFStream.cxx | 2 +- testStatus.cxx | 2 +- testSystemInformation.cxx | 2 +- testSystemTools.cxx | 2 +- 15 files changed, 26 insertions(+), 26 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 32e7b83..ebd3ed3 100644 --- a/CONTRIBUTING.rst +++ b/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 diff --git a/CommandLineArguments.cxx b/CommandLineArguments.cxx index e45db36..ccd5f6d 100644 --- a/CommandLineArguments.cxx +++ b/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; } diff --git a/Glob.cxx b/Glob.cxx index fa2c295..92eae41 100644 --- a/Glob.cxx +++ b/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) { diff --git a/ProcessWin32.c b/ProcessWin32.c index 17e1507..0b43b4a 100644 --- a/ProcessWin32.c +++ b/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)( - (char*)self->CurrentInfo + self->CurrentInfo->NextEntryDelta)); + self->CurrentInfo = + ((PSYSTEM_PROCESS_INFORMATION)((char*)self->CurrentInfo + + self->CurrentInfo->NextEntryDelta)); return 1; } self->CurrentInfo = 0; diff --git a/RegularExpression.cxx b/RegularExpression.cxx index fb4e380..c96a96d 100644 --- a/RegularExpression.cxx +++ b/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(comp.regsize); diff --git a/RegularExpression.hxx.in b/RegularExpression.hxx.in index 2709cde..2cb7f5e 100644 --- a/RegularExpression.hxx.in +++ b/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; } diff --git a/kwsysPrivate.h b/kwsysPrivate.h index dd9c127..2f5c2fa 100644 --- a/kwsysPrivate.h +++ b/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." diff --git a/testConfigure.cxx b/testConfigure.cxx index a3c2ed3..4a34e1c 100644 --- a/testConfigure.cxx +++ b/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; diff --git a/testConsoleBuf.cxx b/testConsoleBuf.cxx index 4b7ddf0..f9b826d 100644 --- a/testConsoleBuf.cxx +++ b/testConsoleBuf.cxx @@ -743,7 +743,7 @@ static int testConsole() #endif -int testConsoleBuf(int, char* []) +int testConsoleBuf(int, char*[]) { int ret = 0; diff --git a/testDirectory.cxx b/testDirectory.cxx index 79bdc98..8c73af2 100644 --- a/testDirectory.cxx +++ b/testDirectory.cxx @@ -19,7 +19,7 @@ file Copyright.txt or https://cmake.org/licensing#kwsys for details. */ #include -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() + - _copyDirectoryTest(); + return doLongPathTest() + nonExistentDirectoryTest() + copyDirectoryTest(); } diff --git a/testEncoding.cxx b/testEncoding.cxx index 1d605cb..3acb6c8 100644 --- a/testEncoding.cxx +++ b/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) { diff --git a/testFStream.cxx b/testFStream.cxx index 3325e20..9897a58 100644 --- a/testFStream.cxx +++ b/testFStream.cxx @@ -136,7 +136,7 @@ static int testBOMIO() return 0; } -int testFStream(int, char* []) +int testFStream(int, char*[]) { int ret = 0; diff --git a/testStatus.cxx b/testStatus.cxx index 0a767a8..9cadada 100644 --- a/testStatus.cxx +++ b/testStatus.cxx @@ -16,7 +16,7 @@ file Copyright.txt or https://cmake.org/licensing#kwsys for details. */ # include #endif -int testStatus(int, char* []) +int testStatus(int, char*[]) { bool res = true; { diff --git a/testSystemInformation.cxx b/testSystemInformation.cxx index 4f0c522..7ae94ff 100644 --- a/testSystemInformation.cxx +++ b/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 diff --git a/testSystemTools.cxx b/testSystemTools.cxx index 487da8d..8afcb68 100644 --- a/testSystemTools.cxx +++ b/testSystemTools.cxx @@ -1209,7 +1209,7 @@ static bool CheckSplitString() return ret; } -int testSystemTools(int, char* []) +int testSystemTools(int, char*[]) { bool res = true; -- cgit v0.12