From a392427d3a2fa7631b066e5e8a27caecebad1ecd Mon Sep 17 00:00:00 2001
From: clang-format <clang-format@example.org>
Date: Fri, 20 Oct 2023 23:44:21 +0200
Subject: [PATCH 1/3] Mass-apply clang-format 17.0.3 using
 ./apply-clang-format.sh

---
 expat/lib/xmltok.c        | 2 +-
 expat/lib/xmltok_impl.c   | 2 +-
 expat/xmlwf/readfilemap.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/expat/lib/xmltok.c b/expat/lib/xmltok.c
index 482c6f5b..3b2e0a8c 100644
--- a/expat/lib/xmltok.c
+++ b/expat/lib/xmltok.c
@@ -76,7 +76,7 @@
 #define VTABLE VTABLE1, PREFIX(toUtf8), PREFIX(toUtf16)
 
 #define UCS2_GET_NAMING(pages, hi, lo)                                         \
-  (namingBitmap[(pages[hi] << 3) + ((lo) >> 5)] & (1u << ((lo)&0x1F)))
+  (namingBitmap[(pages[hi] << 3) + ((lo) >> 5)] & (1u << ((lo) & 0x1F)))
 
 /* A 2 byte UTF-8 representation splits the characters 11 bits between
    the bottom 5 and 6 bits of the bytes.  We need 8 bits to index into
diff --git a/expat/lib/xmltok_impl.c b/expat/lib/xmltok_impl.c
index 1971d74b..239a2d06 100644
--- a/expat/lib/xmltok_impl.c
+++ b/expat/lib/xmltok_impl.c
@@ -126,7 +126,7 @@
 #  endif
 
 #  define HAS_CHARS(enc, ptr, end, count)                                      \
-    ((end) - (ptr) >= ((count)*MINBPC(enc)))
+    ((end) - (ptr) >= ((count) * MINBPC(enc)))
 
 #  define HAS_CHAR(enc, ptr, end) HAS_CHARS(enc, ptr, end, 1)
 
diff --git a/expat/xmlwf/readfilemap.c b/expat/xmlwf/readfilemap.c
index 0ddb0434..0d8e23a9 100644
--- a/expat/xmlwf/readfilemap.c
+++ b/expat/xmlwf/readfilemap.c
@@ -67,7 +67,7 @@
 #  ifndef S_IFMT
 #    define S_IFMT _S_IFMT
 #  endif
-#  define S_ISREG(m) (((m)&S_IFMT) == S_IFREG)
+#  define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
 #endif /* not S_ISREG */
 
 #ifndef O_BINARY

From e07ee1ec32a16ba58daff74776871a26d01a31a6 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Fri, 20 Oct 2023 23:47:52 +0200
Subject: [PATCH 2/3] Actions: Upgrade Clang from 15 to 17

---
 .ci.sh                      | 2 +-
 .github/workflows/linux.yml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.ci.sh b/.ci.sh
index 9e6dbd0f..d88f5943 100755
--- a/.ci.sh
+++ b/.ci.sh
@@ -39,7 +39,7 @@ if [[ ${RUNNER_OS} = macOS ]]; then
     export PATH="/usr/local/opt/coreutils/libexec/gnubin${PATH:+:}${PATH}"
     export PATH="/usr/local/opt/findutils/libexec/gnubin${PATH:+:}${PATH}"
 elif [[ ${RUNNER_OS} = Linux ]]; then
-    export PATH="/usr/lib/llvm-15/bin:${PATH}"
+    export PATH="/usr/lib/llvm-17/bin:${PATH}"
 else
     echo "Unsupported RUNNER_OS \"${RUNNER_OS}\"." >&2
     exit 1
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 53441950..70616a07 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -115,13 +115,13 @@ jobs:
         set -x
         source /etc/os-release
         wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-        sudo add-apt-repository "deb https://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-15 main"
+        sudo add-apt-repository "deb https://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-17 main"
         sudo apt-get update  # due to new repository
         # NOTE: Please note the version-specific ${PATH} extension for Clang in .ci.sh
         sudo apt-get install --yes --no-install-recommends -V \
-            clang-15 \
-            clang-format-15 \
-            libclang-rt-15-dev
+            clang-17 \
+            clang-format-17 \
+            libclang-rt-17-dev
     - name: Install build dependencies (common)
       run: |-
         sudo apt-get install --yes --no-install-recommends -V \

From cf2a57bbe62cd4e731b70fc1abf9c3683a5c93ae Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Fri, 20 Oct 2023 23:57:31 +0200
Subject: [PATCH 3/3] linux.yml: Make note about .ci.sh harder to overlook

---
 .github/workflows/linux.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 70616a07..7f8fb312 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -117,7 +117,7 @@ jobs:
         wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
         sudo add-apt-repository "deb https://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-17 main"
         sudo apt-get update  # due to new repository
-        # NOTE: Please note the version-specific ${PATH} extension for Clang in .ci.sh
+        # NOTE: Please note the version-specific ${PATH} extension for Clang adding /usr/lib/llvm-17/bin in .ci.sh
         sudo apt-get install --yes --no-install-recommends -V \
             clang-17 \
             clang-format-17 \