Skip to content

Tests - clang-format-22 #9348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mcspr merged 1 commit into from
Nov 14, 2026
Merged

Tests - clang-format-22 #9348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/style-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: |
sudo apt update
python ./tests/test_restyle.py --quiet
env CLANG_FORMAT="clang-format-18" bash ./tests/ci/style_check.sh
env CLANG_FORMAT="clang-format-22" bash ./tests/ci/style_check.sh

# Validate orthography

Expand Down
6 changes: 2 additions & 4 deletions cores/esp8266/core_esp8266_si2c.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,7 @@ class Twi
TWIPM_IDLE,
TWIPM_ADDRESSED,
TWIPM_WAIT
} twip_mode
= TWIPM_IDLE;
} twip_mode = TWIPM_IDLE;
volatile enum {
TWIP_UNKNOWN = 0,
TWIP_IDLE,
Expand All @@ -97,8 +96,7 @@ class Twi
TWIP_RWAIT_ACK,
TWIP_WRITE,
TWIP_BUS_ERR
} twip_state
= TWIP_IDLE;
} twip_state = TWIP_IDLE;
volatile int twip_status = TW_NO_INFO;
volatile int bitCount = 0;

Expand Down
4 changes: 2 additions & 2 deletions libraries/ESP8266mDNS/src/LEAmDNS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ namespace MDNSImplementation
bool MDNSResponder::removeService(const MDNSResponder::hMDNSService p_hService)
{
stcMDNSService* pService = 0;
bool bResult = (((pService = _findService(p_hService)))
bool bResult = (((pService = _findService(p_hService)))
&& (_announceService(*pService, false)) && (_releaseService(pService)));
DEBUG_EX_ERR(if (!bResult) {
DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] removeService: FAILED!\n"));
Expand Down Expand Up @@ -979,7 +979,7 @@ namespace MDNSImplementation
{
stcMDNSServiceQuery* pServiceQuery = 0;
bool bResult = (((pServiceQuery = _findServiceQuery(p_hServiceQuery)))
&& (_removeServiceQuery(pServiceQuery)));
&& (_removeServiceQuery(pServiceQuery)));
DEBUG_EX_ERR(if (!bResult) {
DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] removeServiceQuery: FAILED!\n"));
});
Expand Down
2 changes: 1 addition & 1 deletion libraries/ESP8266mDNS/src/LEAmDNS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,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
Expand Down
8 changes: 4 additions & 4 deletions libraries/ESP8266mDNS/src/LEAmDNS_Helpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ namespace MDNSImplementation
char acIndexBuffer[16];
sprintf(acIndexBuffer, "%lu", (++ulIndex));
size_t stLength = ((pFoundDivider - p_rpcDomain + strlen(pcDivider))
+ strlen(acIndexBuffer) + 1);
+ strlen(acIndexBuffer) + 1);
char* pNewHostname = new char[stLength];
if (pNewHostname)
{
Expand Down Expand Up @@ -105,9 +105,9 @@ namespace MDNSImplementation
if (!pFoundDivider) // not yet extended (or failed to increment extension) -> start
// indexing
{
size_t stLength = strlen(p_rpcDomain)
+ (strlen(pcDivider) + 1 + 1); // Name + Divider + '2' + '\0'
char* pNewHostname = new char[stLength];
size_t stLength = strlen(p_rpcDomain)
+ (strlen(pcDivider) + 1 + 1); // Name + Divider + '2' + '\0'
char* pNewHostname = new char[stLength];
if (pNewHostname)
{
sprintf(pNewHostname, "%s%s2", p_rpcDomain, pcDivider);
Expand Down
14 changes: 7 additions & 7 deletions libraries/ESP8266mDNS/src/LEAmDNS_Transfer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,8 +605,8 @@ namespace MDNSImplementation
{
uint32_t u32IP4Address;
bool bResult = ((MDNS_IP4_SIZE == p_u16RDLength)
&& (_udpReadBuffer((unsigned char*)&u32IP4Address, MDNS_IP4_SIZE))
&& ((p_rRRAnswerA.m_IPAddress = IPAddress(u32IP4Address))));
&& (_udpReadBuffer((unsigned char*)&u32IP4Address, MDNS_IP4_SIZE))
&& ((p_rRRAnswerA.m_IPAddress = IPAddress(u32IP4Address))));
DEBUG_EX_ERR(if (!bResult)
DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] _readRRAnswerA: FAILED!\n")););
return bResult;
Expand Down Expand Up @@ -1358,11 +1358,11 @@ namespace MDNSImplementation
uint8_t u8B2((p_MsgHeader.m_1bRA << 7) | (p_MsgHeader.m_3bZ << 4)
| (p_MsgHeader.m_4bRCode));
bool bResult = ((_write16(p_MsgHeader.m_u16ID, p_rSendParameter))
&& (_write8(u8B1, p_rSendParameter)) && (_write8(u8B2, p_rSendParameter))
&& (_write16(p_MsgHeader.m_u16QDCount, p_rSendParameter))
&& (_write16(p_MsgHeader.m_u16ANCount, p_rSendParameter))
&& (_write16(p_MsgHeader.m_u16NSCount, p_rSendParameter))
&& (_write16(p_MsgHeader.m_u16ARCount, p_rSendParameter)));
&& (_write8(u8B1, p_rSendParameter)) && (_write8(u8B2, p_rSendParameter))
&& (_write16(p_MsgHeader.m_u16QDCount, p_rSendParameter))
&& (_write16(p_MsgHeader.m_u16ANCount, p_rSendParameter))
&& (_write16(p_MsgHeader.m_u16NSCount, p_rSendParameter))
&& (_write16(p_MsgHeader.m_u16ARCount, p_rSendParameter)));

DEBUG_EX_ERR(if (!bResult) {
DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] _writeMDNSMsgHeader: FAILED!\n"));
Expand Down
2 changes: 1 addition & 1 deletion libraries/Netdump/src/PacketType.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class PacketType
};

PacketType();
PacketType(PType pt) : ptype(pt) {};
PacketType(PType pt) : ptype(pt) { };

operator PType() const
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/esp8266/examples/CallBackList/CallBackGeneric.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ using namespace experimental::CBListImplentation;

class exampleClass {
public:
exampleClass(){};
exampleClass() {};

using exCallBack = std::function<void(int)>;
using exHandler = CallBackList<exCallBack>::CallBackHandler;
Expand Down
4 changes: 2 additions & 2 deletions libraries/lwIP_w5100/src/utility/w5100.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ class Wiznet5100
<< 10; /* Length of Tx buffer in bytes */
static const uint16_t RxBufferLength = (1 << RxBufferSize)
<< 10; /* Length of Rx buffer in bytes */
static const uint16_t TxBufferMask = TxBufferLength - 1;
static const uint16_t RxBufferMask = RxBufferLength - 1;
static const uint16_t TxBufferMask = TxBufferLength - 1;
static const uint16_t RxBufferMask = RxBufferLength - 1;

SPIClass& _spi;
int8_t _cs;
Expand Down
1 change: 1 addition & 0 deletions tests/clang-format-core.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ ColumnLimit: 100
KeepEmptyLinesAtTheStartOfBlocks: false
SpaceAfterTemplateKeyword: false
SpaceBeforeInheritanceColon: false
SpaceInEmptyBraces: Block
SpacesBeforeTrailingComments: 2
AllowShortBlocksOnASingleLine: Empty
AllowShortFunctionsOnASingleLine: Empty
Expand Down
16 changes: 8 additions & 8 deletions tests/host/common/strl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ extern "C"
#ifdef STRLCAT_MISSING
// '_cups_strlcat()' - Safely concatenate two strings.

size_t /* O - Length of string */
strlcat(char* dst, /* O - Destination string */
const char* src, /* I - Source string */
size_t size) /* I - Size of destination string buffer */
size_t /* O - Length of string */
strlcat(char* dst, /* O - Destination string */
const char* src, /* I - Source string */
size_t size) /* I - Size of destination string buffer */
{
size_t srclen; /* Length of source string */
size_t dstlen; /* Length of destination string */
Expand Down Expand Up @@ -48,10 +48,10 @@ extern "C"
#ifdef STRLCPY_MISSING
// '_cups_strlcpy()' - Safely copy two strings.

size_t /* O - Length of string */
strlcpy(char* dst, /* O - Destination string */
const char* src, /* I - Source string */
size_t size) /* I - Size of destination string buffer */
size_t /* O - Length of string */
strlcpy(char* dst, /* O - Destination string */
const char* src, /* I - Source string */
size_t size) /* I - Size of destination string buffer */
{
size_t srclen; /* Length of source string */

Expand Down
Loading