Migrate from astyle to clang-format (#8464)

esp8266 · Mar 3, 2022 · 19b7a29 · 19b7a29
1 parent 46190b6
commit 19b7a29
Show file tree

Hide file tree

Showing 241 changed files with 15,428 additions and 15,700 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -238,11 +238,20 @@ jobs:
         python-version: '3.x'
     - name: Style check
       env:
+        LLVM_SNAPSHOT_KEY: "6084F3CF814B57C1CF12EFD515CF4D18AF4F7421"
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
         TRAVIS_TAG: ${{ github.ref }}
       run: |
+          export GNUPGHOME=$(mktemp -d)
+          gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$LLVM_SNAPSHOT_KEY"
+          gpg --batch --armor --export "$LLVM_SNAPSHOT_KEY" | \
+            sudo tee /etc/apt/trusted.gpg.d/llvm-snapshot.gpg.asc
+          rm -r $GNUPGHOME
+          echo "deb http://apt.llvm.org/focal/     llvm-toolchain-focal-13   main" | \
+            sudo tee /etc/apt/sources.list.d/llvm.list
           sudo apt update
-          sudo apt install astyle
+          sudo apt install clang-format-13
+          pip3 install pyyaml
           bash ./tests/ci/style_check.sh
 
 

diff --git a/cores/esp8266/LwipDhcpServer-NonOS.cpp b/cores/esp8266/LwipDhcpServer-NonOS.cpp
@@ -23,7 +23,7 @@
 // these functions must exists as-is with "C" interface,
 // nonos-sdk calls them at boot time and later
 
-#include <lwip/init.h> // LWIP_VERSION
+#include <lwip/init.h>  // LWIP_VERSION
 
 #include <lwip/netif.h>
 #include "LwipDhcpServer.h"
@@ -35,8 +35,7 @@ DhcpServer dhcpSoftAP(&netif_git[SOFTAP_IF]);
 
 extern "C"
 {
-
-    void dhcps_start(struct ip_info *info, netif* apnetif)
+    void dhcps_start(struct ip_info* info, netif* apnetif)
     {
         // apnetif is esp interface, replaced by lwip2's
         // netif_git[SOFTAP_IF] interface in constructor
@@ -61,4 +60,4 @@ extern "C"
         dhcpSoftAP.end();
     }
 
-} // extern "C"
+}  // extern "C"