Skip to content

Commit 67538f0

Browse files
mcsprhasenradball
authored andcommitted
Migrate from astyle to clang-format (esp8266#8464)
1 parent bff5cda commit 67538f0

File tree

241 files changed

+15428
-15700
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

241 files changed

+15428
-15700
lines changed

.github/workflows/pull-request.yml

+10-1
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,20 @@ jobs:
238238
python-version: '3.x'
239239
- name: Style check
240240
env:
241+
LLVM_SNAPSHOT_KEY: "6084F3CF814B57C1CF12EFD515CF4D18AF4F7421"
241242
TRAVIS_BUILD_DIR: ${{ github.workspace }}
242243
TRAVIS_TAG: ${{ github.ref }}
243244
run: |
245+
export GNUPGHOME=$(mktemp -d)
246+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$LLVM_SNAPSHOT_KEY"
247+
gpg --batch --armor --export "$LLVM_SNAPSHOT_KEY" | \
248+
sudo tee /etc/apt/trusted.gpg.d/llvm-snapshot.gpg.asc
249+
rm -r $GNUPGHOME
250+
echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main" | \
251+
sudo tee /etc/apt/sources.list.d/llvm.list
244252
sudo apt update
245-
sudo apt install astyle
253+
sudo apt install clang-format-13
254+
pip3 install pyyaml
246255
bash ./tests/ci/style_check.sh
247256
248257

cores/esp8266/LwipDhcpServer-NonOS.cpp

+3-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// these functions must exists as-is with "C" interface,
2424
// nonos-sdk calls them at boot time and later
2525

26-
#include <lwip/init.h> // LWIP_VERSION
26+
#include <lwip/init.h> // LWIP_VERSION
2727

2828
#include <lwip/netif.h>
2929
#include "LwipDhcpServer.h"
@@ -35,8 +35,7 @@ DhcpServer dhcpSoftAP(&netif_git[SOFTAP_IF]);
3535

3636
extern "C"
3737
{
38-
39-
void dhcps_start(struct ip_info *info, netif* apnetif)
38+
void dhcps_start(struct ip_info* info, netif* apnetif)
4039
{
4140
// apnetif is esp interface, replaced by lwip2's
4241
// netif_git[SOFTAP_IF] interface in constructor
@@ -61,4 +60,4 @@ extern "C"
6160
dhcpSoftAP.end();
6261
}
6362

64-
} // extern "C"
63+
} // extern "C"

0 commit comments

Comments
 (0)