Merge branch 'topic/bbannier/bump-clang-format'

.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 #
 repos:
 - repo: https://github.com/pre-commit/mirrors-clang-format
-  rev: 'v17.0.3'
+  rev: 'v18.1.8'
   hooks:
   - id: clang-format
     types_or:
@@ -26,7 +26,6 @@ repos:
   rev: v0.6.13
   hooks:
   - id: cmake-format
-    exclude: '^auxil/.*$'
 
 - repo: https://github.com/crate-ci/typos
   rev: v1.16.21

CHANGES

@@ -1,3 +1,20 @@
+7.1.0-dev.236 | 2024-09-03 10:18:32 +0200
+
+  * Remove pre-commit exclusions for clang-format (Benjamin Bannier, Corelight)
+
+    We previously would ignore any files under `auxil/`. Since pre-commit
+    only formats files tracked in this repo, and `auxil/` today contains
+    only submodules this exclusion did not exclude anything; if however we
+    ever end up adding C++ files under `auxil/` we would like them to be
+    formatted consistently.
+
+  * Bump clang-format (Benjamin Bannier, Corelight)
+
+    This patch contains a bump of the configured clang-format version from
+    17.0.3 to 18.1.8 and automatically generated C++ source updates. The
+    main difference we are seeing from this is fixes for previously
+    incomplete reformats.
+
 7.1.0-dev.233 | 2024-09-03 10:02:59 +0200
 
   * Bump zeek-aux for zeek/zeek-aux#57 (Arne Welzel, Corelight)

VERSION

@@ -1 +1 @@
-7.1.0-dev.233
+7.1.0-dev.236

src/util.cc

@@ -1649,7 +1649,8 @@ TEST_CASE("util path ops"){
 #ifdef _MSC_VER
 // TODO: adapt these tests to Windows paths
 #else
-    SUBCASE("SafeDirname"){SafeDirname d("/this/is/a/path", false);
+    SUBCASE("SafeDirname") {
+        SafeDirname d("/this/is/a/path", false);
         CHECK(d.result == "/this/is/a");
 
         SafeDirname d2("invalid", false);
@@ -1671,10 +1672,7 @@ SUBCASE("SafeBasename") {
 #endif
 }
 
-SafeDirname::SafeDirname(const char* path, bool error_aborts)
+SafeDirname::SafeDirname(const char* path, bool error_aborts) : SafePathOp() { DoFunc(path ? path : "", error_aborts); }
-    : SafePathOp() {
-    DoFunc(path ? path : "", error_aborts);
-}
 
 SafeDirname::SafeDirname(const string& path, bool error_aborts) : SafePathOp() { DoFunc(path, error_aborts); }
 
@@ -2303,8 +2301,7 @@ static void strerror_r_helper(char* result, char* buf, size_t buflen) {
         buf[buflen - 1] = 0;
 }
 
-static void strerror_r_helper(int result, char* buf, size_t buflen) { /* XSI flavor of strerror_r, no-op. */
+static void strerror_r_helper(int result, char* buf, size_t buflen) { /* XSI flavor of strerror_r, no-op. */ }
-}
 
 void zeek_strerror_r(int zeek_errno, char* buf, size_t buflen) {
 #ifdef _MSC_VER