arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

CI - clang-format-18 (#9225)

Browse Source 
* Fix shell variable comparison without $CI present

+ '[' = true ']'
./tests/restyle.sh: line 16: [: =: unary operator expected

vs.

+ '[' '' = true ']'

* Update to clang-format-18

new opt to skip overly eager macro formatting
https://clang.llvm.org/docs/ClangFormatStyleOptions.html#skipmacrodefinitionbody

minor changes between 15 and 18 for ide examples

reference arduino-ide format is still stuck with 15, though
https://github.com/arduino/clang-static-binaries/releases

* Pin clang-format in CI recipe not the script itself

* style
This commit is contained in:
Max Prokhorov 2025-01-24 09:40:22 +03:00 committed by GitHub
parent bb79e9076e
commit be3035c853
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 40 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/style-check.yml vendored
View File

@ -27,7 +27,7 @@ jobs:
run: |
sudo apt update
python ./tests/test_restyle.py --quiet
bash ./tests/ci/style_check.sh
env CLANG_FORMAT="clang-format-18" bash ./tests/ci/style_check.sh
# Validate orthography

2
libraries/ESP8266WebServer/examples/WebServer/WebServer.ino
View File

@ -153,7 +153,7 @@ public:
// Close the file
if (_fsUploadFile) { _fsUploadFile.close(); }
} // if
} // upload()
} // upload()
protected:
File _fsUploadFile;

3
libraries/ESP8266mDNS/src/LEAmDNS.h
View File

@ -492,8 +492,7 @@ namespace MDNSImplementation
{
MDNSServiceInfo(MDNSResponder& p_pM, MDNSResponder::hMDNSServiceQuery p_hS,
uint32_t p_u32A) :
p_pMDNSResponder(p_pM),
p_hServiceQuery(p_hS), p_u32AnswerIndex(p_u32A) {};
p_pMDNSResponder(p_pM), p_hServiceQuery(p_hS), p_u32AnswerIndex(p_u32A) {};
struct CompareKey
{
bool operator()(char const* a, char const* b) const

18
libraries/ESP8266mDNS/src/LEAmDNS_Control.cpp
View File

@ -631,8 +631,8 @@ namespace MDNSImplementation
}
}
} // service tiebreak possibility
} // for services
} // ANY answers
} // for services
} // ANY answers
}
else
{
@ -955,7 +955,7 @@ namespace MDNSImplementation
}
pRRAnswer = pRRAnswer->m_pNext; // Next collected answer
} // while (answers)
} // while (answers)
} while ((bFoundNewKeyAnswer) && (bResult));
} // else: No answers provided
DEBUG_EX_ERR(if (!bResult) {
@ -1110,7 +1110,7 @@ namespace MDNSImplementation
}
pServiceQuery = pServiceQuery->m_pNext;
} // while(service query)
} // else: No p_pSRVAnswer
} // else: No p_pSRVAnswer
DEBUG_EX_ERR(if (!bResult) {
DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] _processSRVAnswer: FAILED!\n"));
});
@ -1173,7 +1173,7 @@ namespace MDNSImplementation
}
pServiceQuery = pServiceQuery->m_pNext;
} // while(service query)
} // else: No p_pTXTAnswer
} // else: No p_pTXTAnswer
DEBUG_EX_ERR(if (!bResult) {
DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] _processTXTAnswer: FAILED!\n"));
});
@ -1261,7 +1261,7 @@ namespace MDNSImplementation
}
pServiceQuery = pServiceQuery->m_pNext;
} // while(service query)
} // else: No p_pAAnswer
} // else: No p_pAAnswer
DEBUG_EX_ERR(if (!bResult) {
DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] _processAAnswer: FAILED!\n"));
});
@ -1349,7 +1349,7 @@ namespace MDNSImplementation
}
pServiceQuery = pServiceQuery->m_pNext;
} // while(service query)
} // else: No p_pAAAAAnswer
} // else: No p_pAAAAAnswer
return bResult;
}
@ -2121,7 +2121,7 @@ namespace MDNSImplementation
} // IP4 flagged
pIP4Address = pNextIP4Address; // Next
} // while
} // while
#endif
#ifdef MDNS_IP6_SUPPORT
// IP6Address (from AAAA)
@ -2185,7 +2185,7 @@ namespace MDNSImplementation
} // IP6 flagged
pIP6Address = pNextIP6Address; // Next
} // while
} // while
#endif
pSQAnswer = pNextSQAnswer;
}

39
libraries/ESP8266mDNS/src/LEAmDNS_Structs.cpp
View File

@ -55,8 +55,7 @@ namespace MDNSImplementation
MDNSResponder::stcMDNSServiceTxt::stcMDNSServiceTxt(const char* p_pcKey /*= 0*/,
const char* p_pcValue /*= 0*/,
bool p_bTemp /*= false*/) :
m_pNext(0),
m_pcKey(0), m_pcValue(0), m_bTemp(p_bTemp)
m_pNext(0), m_pcKey(0), m_pcValue(0), m_bTemp(p_bTemp)
{
setKey(p_pcKey);
setValue(p_pcValue);
@ -67,8 +66,7 @@ namespace MDNSImplementation
*/
MDNSResponder::stcMDNSServiceTxt::stcMDNSServiceTxt(
const MDNSResponder::stcMDNSServiceTxt& p_Other) :
m_pNext(0),
m_pcKey(0), m_pcValue(0), m_bTemp(false)
m_pNext(0), m_pcKey(0), m_pcValue(0), m_bTemp(false)
{
operator=(p_Other);
}
@ -614,9 +612,8 @@ namespace MDNSImplementation
bool p_bRA /*= false*/, unsigned char p_ucRCode /*= 0*/, uint16_t p_u16QDCount /*= 0*/,
uint16_t p_u16ANCount /*= 0*/, uint16_t p_u16NSCount /*= 0*/,
uint16_t p_u16ARCount /*= 0*/) :
m_u16ID(p_u16ID),
m_1bQR(p_bQR), m_4bOpcode(p_ucOpcode), m_1bAA(p_bAA), m_1bTC(p_bTC), m_1bRD(p_bRD),
m_1bRA(p_bRA), m_3bZ(0), m_4bRCode(p_ucRCode), m_u16QDCount(p_u16QDCount),
m_u16ID(p_u16ID), m_1bQR(p_bQR), m_4bOpcode(p_ucOpcode), m_1bAA(p_bAA), m_1bTC(p_bTC),
m_1bRD(p_bRD), m_1bRA(p_bRA), m_3bZ(0), m_4bRCode(p_ucRCode), m_u16QDCount(p_u16QDCount),
m_u16ANCount(p_u16ANCount), m_u16NSCount(p_u16NSCount), m_u16ARCount(p_u16ARCount)
{
}
@ -813,8 +810,7 @@ namespace MDNSImplementation
*/
MDNSResponder::stcMDNS_RRAttributes::stcMDNS_RRAttributes(
uint16_t p_u16Type /*= 0*/, uint16_t p_u16Class /*= 1 DNS_RRCLASS_IN Internet*/) :
m_u16Type(p_u16Type),
m_u16Class(p_u16Class)
m_u16Type(p_u16Type), m_u16Class(p_u16Class)
{
}
@ -910,8 +906,7 @@ namespace MDNSImplementation
MDNSResponder::stcMDNS_RRAnswer::stcMDNS_RRAnswer(
enuAnswerType p_AnswerType, const MDNSResponder::stcMDNS_RRHeader& p_Header,
uint32_t p_u32TTL) :
m_pNext(0),
m_AnswerType(p_AnswerType), m_Header(p_Header), m_u32TTL(p_u32TTL)
m_pNext(0), m_AnswerType(p_AnswerType), m_Header(p_Header), m_u32TTL(p_u32TTL)
{
// Extract 'cache flush'-bit
m_bCacheFlush = (m_Header.m_Attributes.m_u16Class & 0x8000);
@ -955,8 +950,7 @@ namespace MDNSImplementation
*/
MDNSResponder::stcMDNS_RRAnswerA::stcMDNS_RRAnswerA(
const MDNSResponder::stcMDNS_RRHeader& p_Header, uint32_t p_u32TTL) :
stcMDNS_RRAnswer(AnswerType_A, p_Header, p_u32TTL),
m_IPAddress(0, 0, 0, 0)
stcMDNS_RRAnswer(AnswerType_A, p_Header, p_u32TTL), m_IPAddress(0, 0, 0, 0)
{
}
@ -1094,8 +1088,8 @@ namespace MDNSImplementation
*/
MDNSResponder::stcMDNS_RRAnswerSRV::stcMDNS_RRAnswerSRV(
const MDNSResponder::stcMDNS_RRHeader& p_Header, uint32_t p_u32TTL) :
stcMDNS_RRAnswer(AnswerType_SRV, p_Header, p_u32TTL),
m_u16Priority(0), m_u16Weight(0), m_u16Port(0)
stcMDNS_RRAnswer(AnswerType_SRV, p_Header, p_u32TTL), m_u16Priority(0), m_u16Weight(0),
m_u16Port(0)
{
}
@ -1132,8 +1126,7 @@ namespace MDNSImplementation
*/
MDNSResponder::stcMDNS_RRAnswerGeneric::stcMDNS_RRAnswerGeneric(
const stcMDNS_RRHeader& p_Header, uint32_t p_u32TTL) :
stcMDNS_RRAnswer(AnswerType_Generic, p_Header, p_u32TTL),
m_u16RDLength(0), m_pu8RDData(0)
stcMDNS_RRAnswer(AnswerType_Generic, p_Header, p_u32TTL), m_u16RDLength(0), m_pu8RDData(0)
{
}
@ -1212,8 +1205,7 @@ namespace MDNSImplementation
MDNSResponder::stcMDNSService::stcMDNSService(const char* p_pcName /*= 0*/,
const char* p_pcService /*= 0*/,
const char* p_pcProtocol /*= 0*/) :
m_pNext(0),
m_pcName(0), m_bAutoName(false), m_pcService(0), m_pcProtocol(0), m_u16Port(0),
m_pNext(0), m_pcName(0), m_bAutoName(false), m_pcService(0), m_pcProtocol(0), m_u16Port(0),
m_u8ReplyMask(0), m_fnTxtCallback(0)
{
setName(p_pcName);
@ -1538,9 +1530,7 @@ namespace MDNSImplementation
MDNSResponder::stcMDNSServiceQuery::stcAnswer::stcIP4Address::stcIP4Address constructor
*/
MDNSResponder::stcMDNSServiceQuery::stcAnswer::stcIP4Address::stcIP4Address(
IPAddress p_IPAddress, uint32_t p_u32TTL /*= 0*/) :
m_pNext(0),
m_IPAddress(p_IPAddress)
IPAddress p_IPAddress, uint32_t p_u32TTL /*= 0*/) : m_pNext(0), m_IPAddress(p_IPAddress)
{
m_TTL.set(p_u32TTL);
}
@ -2172,9 +2162,8 @@ namespace MDNSImplementation
*/
MDNSResponder::stcMDNSSendParameter::stcDomainCacheItem::stcDomainCacheItem(
const void* p_pHostnameOrService, bool p_bAdditionalData, uint32_t p_u16Offset) :
m_pNext(0),
m_pHostnameOrService(p_pHostnameOrService), m_bAdditionalData(p_bAdditionalData),
m_u16Offset(p_u16Offset)
m_pNext(0), m_pHostnameOrService(p_pHostnameOrService),
m_bAdditionalData(p_bAdditionalData), m_u16Offset(p_u16Offset)
{
}

3
libraries/I2S/examples/InputSerialPlotter/InputSerialPlotter.ino
View File

@ -21,8 +21,7 @@ void setup() {
// start I2S at 8 kHz with 24-bits per sample
if (!I2S.begin(I2S_PHILIPS_MODE, 8000, 24)) {
Serial.println("Failed to initialize I2S!");
while (1)
; // do nothing
while (1); // do nothing
}
}

3
libraries/I2S/examples/SimpleTone/SimpleTone.ino
View File

@ -26,8 +26,7 @@ void setup() {
// start I2S at the sample rate with 16-bits per sample
if (!I2S.begin(I2S_PHILIPS_MODE, sampleRate, 16)) {
Serial.println("Failed to initialize I2S!");
while (1)
; // do nothing
while (1); // do nothing
}
}

6
libraries/TFT_Touch_Shield_V2/examples/tftbmp/tftbmp.ino
View File

@ -55,8 +55,7 @@ void setup() {
if (!SD.begin(PIN_SD_CS)) {
Serial.println("failed!");
while (1)
; // init fail, die here
while (1); // init fail, die here
}
Serial.println("SD OK!");
@ -69,8 +68,7 @@ void loop() {
bmpFile = SD.open(__Gsbmp_files[i]);
if (!bmpFile) {
Serial.println("didn't find image");
while (1)
;
while (1);
}
if (!bmpReadHeader(bmpFile)) {

9
libraries/TFT_Touch_Shield_V2/examples/tftbmp2/tftbmp2.ino
View File

@ -99,8 +99,7 @@ void setup() {
if (!SD.begin(PIN_SD_CS)) {
Serial.println("failed!");
while (1)
; // init fail, die here
while (1); // init fail, die here
}
Serial.println("SD OK!");
@ -141,8 +140,7 @@ void loop() {
if (!bmpFile) {
Serial.println("didn't find image");
while (1)
;
while (1);
}
if (!bmpReadHeader(bmpFile)) {
@ -153,8 +151,7 @@ void loop() {
bmpdraw(bmpFile, 0, 0, 1);
bmpFile.close();
while (1)
;
while (1);
}
/*********************************************/

3
libraries/esp8266/examples/SerialStress/SerialStress.ino
View File

@ -81,8 +81,7 @@ void setup() {
// bind RX and TX
USC0(0) |= (1 << UCLBE);
while (Serial.read() == -1)
;
while (Serial.read() == -1);
if (Serial.hasOverrun()) { logger->print("overrun?\n"); }
timeout = (start_ms = last_ms = millis()) + TIMEOUT;

1
tests/clang-format-core.yaml
View File

@ -27,3 +27,4 @@ BreakBeforeBraces: Allman
IndentWidth: 4
IndentCaseLabels: false
ReflowComments: false
SkipMacroDefinitionBody: true

3
tests/device/libraries/BSTest/src/BSTest.h
View File

@ -27,8 +27,7 @@ class TestCase
public:
TestCase(TestCase* prev, test_case_func_t func, const char* file, size_t line, const char* name,
const char* desc) :
m_func(func),
m_file(file), m_line(line), m_name(name), m_desc(desc)
m_func(func), m_file(file), m_line(line), m_name(name), m_desc(desc)
{
if (prev)
{

4
tests/host/common/queue.h
View File

@ -184,7 +184,7 @@
struct name \
{ \
struct type* stqh_first; /* first element */ \
struct type** stqh_last; /* addr of last next element */ \
struct type** stqh_last; /* addr of last next element */ \
}
#define STAILQ_HEAD_INITIALIZER(head) \
@ -371,7 +371,7 @@
struct name \
{ \
struct type* tqh_first; /* first element */ \
struct type** tqh_last; /* addr of last next element */ \
struct type** tqh_last; /* addr of last next element */ \
}
#define TAILQ_HEAD_INITIALIZER(head) \

7
tests/restyle.sh
View File

@ -8,16 +8,13 @@ test -d ${root}/cores/esp8266
test -d ${root}/libraries
# allow `env CLANG_FORMAT=clang-format-N`, or some other version
# default to v15, latest stable version from ubuntu-latest Github Actions image
CLANG_FORMAT=${CLANG_FORMAT:-clang-format-15}
CLANG_FORMAT=${CLANG_FORMAT:-clang-format}
cd $root
python $root/tests/restyle.py format --clang-format=$CLANG_FORMAT preset --include core --include arduino
if [ $CI = "true" ] ; then
echo foo
if [ "$CI" = "true" ] ; then
python $root/tests/restyle.py assert --with-summary --with-errors
else
echo bar
python $root/tests/restyle.py assert --with-diff
fi