Skip to content
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

[clang-tidy] Fix a bunch of style warnings #29242

Merged
merged 1 commit into from
Sep 14, 2023
Merged

[clang-tidy] Fix a bunch of style warnings #29242

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 src/inet/IPAddress.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ ip4_addr_t IPAddress::ToIPv4() const

#endif // INET_CONFIG_ENABLE_IPV4

ip_addr_t IPAddress::ToLwIPAddr(void) const
ip_addr_t IPAddress::ToLwIPAddr() const
{
ip_addr_t ret;

Expand Down
21 changes: 8 additions & 13 deletions src/inet/InetInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ bool InterfaceIterator::Next()
#if defined(NETIF_FOREACH)
NETIF_FOREACH(mCurNetif)
#else
for (mCurNetif = netif_list; mCurNetif != NULL; mCurNetif = mCurNetif->next)
for (mCurNetif = netif_list; mCurNetif != nullptr; mCurNetif = mCurNetif->next)
#endif
{
if (mCurNetif == prevNetif)
Expand All @@ -229,7 +229,7 @@ bool InterfaceIterator::Next()
// Unlock LwIP stack
UNLOCK_TCPIP_CORE();

return mCurNetif != NULL;
return mCurNetif != nullptr;
}

CHIP_ERROR InterfaceIterator::GetInterfaceName(char * nameBuf, size_t nameBufSize)
Expand Down Expand Up @@ -322,13 +322,11 @@ CHIP_ERROR InterfaceAddressIterator::GetAddress(IPAddress & outIPAddress)
return CHIP_NO_ERROR;
}
#if INET_CONFIG_ENABLE_IPV4 && LWIP_IPV4
else
{
outIPAddress = IPAddress(*netif_ip4_addr(curIntf));
return CHIP_NO_ERROR;
}
#endif // INET_CONFIG_ENABLE_IPV4 && LWIP_IPV4
outIPAddress = IPAddress(*netif_ip4_addr(curIntf));
return CHIP_NO_ERROR;
#else
return CHIP_ERROR_INTERNAL;
#endif // INET_CONFIG_ENABLE_IPV4 && LWIP_IPV4
}

uint8_t InterfaceAddressIterator::GetPrefixLength()
Expand All @@ -340,11 +338,8 @@ uint8_t InterfaceAddressIterator::GetPrefixLength()
return 64;
}
#if INET_CONFIG_ENABLE_IPV4 && LWIP_IPV4
else
{
struct netif * curIntf = mIntfIter.GetInterfaceId().GetPlatformInterface();
return NetmaskToPrefixLength((const uint8_t *) netif_ip4_netmask(curIntf), 4);
}
struct netif * curIntf = mIntfIter.GetInterfaceId().GetPlatformInterface();
return NetmaskToPrefixLength((const uint8_t *) netif_ip4_netmask(curIntf), 4);
#endif // INET_CONFIG_ENABLE_IPV4 && LWIP_IPV4
}
return 0;
Expand Down
19 changes: 5 additions & 14 deletions src/inet/UDPEndPointImplLwIP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,7 @@ CHIP_ERROR UDPEndPointImplLwIP::SendMsgImpl(const IPPacketInfo * pktInfo, System
return udp_sendto_if(mUDP, System::LwIPPacketBufferView::UnsafeGetLwIPpbuf(msg), &lwipDestAddr, destPort,
intfId.GetPlatformInterface());
}
else
{
return udp_sendto(mUDP, System::LwIPPacketBufferView::UnsafeGetLwIPpbuf(msg), &lwipDestAddr, destPort);
}
return udp_sendto(mUDP, System::LwIPPacketBufferView::UnsafeGetLwIPpbuf(msg), &lwipDestAddr, destPort);
});

ip_addr_copy(mUDP->local_ip, boundAddr);
Expand Down Expand Up @@ -461,11 +458,8 @@ CHIP_ERROR UDPEndPointImplLwIP::IPv4JoinLeaveMulticastGroupImpl(InterfaceId aInt
return join ? igmp_joingroup_netif(lNetif, &lIPv4Address) //
: igmp_leavegroup_netif(lNetif, &lIPv4Address);
}
else
{
return join ? igmp_joingroup(IP4_ADDR_ANY4, &lIPv4Address) //
: igmp_leavegroup(IP4_ADDR_ANY4, &lIPv4Address);
}
return join ? igmp_joingroup(IP4_ADDR_ANY4, &lIPv4Address) //
: igmp_leavegroup(IP4_ADDR_ANY4, &lIPv4Address);
});

if (lStatus == ERR_MEM)
Expand Down Expand Up @@ -496,11 +490,8 @@ CHIP_ERROR UDPEndPointImplLwIP::IPv6JoinLeaveMulticastGroupImpl(InterfaceId aInt
return join ? mld6_joingroup_netif(lNetif, &lIPv6Address) //
: mld6_leavegroup_netif(lNetif, &lIPv6Address);
}
else
{
return join ? mld6_joingroup(IP6_ADDR_ANY6, &lIPv6Address) //
: mld6_leavegroup(IP6_ADDR_ANY6, &lIPv6Address);
}
return join ? mld6_joingroup(IP6_ADDR_ANY6, &lIPv6Address) //
: mld6_leavegroup(IP6_ADDR_ANY6, &lIPv6Address);
});

if (lStatus == ERR_MEM)
Expand Down
2 changes: 1 addition & 1 deletion src/lib/support/ErrorStr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ DLL_EXPORT void FormatError(char * buf, uint16_t bufSize, const char * subsys, C
{
#if CHIP_CONFIG_SHORT_ERROR_STR

if (subsys == NULL)
if (subsys == nullptr)
{
(void) snprintf(buf, bufSize, "Error " CHIP_CONFIG_SHORT_FORM_ERROR_VALUE_FORMAT, err.AsInteger());
}
Expand Down
13 changes: 5 additions & 8 deletions src/system/SystemError.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ bool FormatPOSIXError(char * buf, uint16_t bufSize, CHIP_ERROR err)
{
const char * desc =
#if CHIP_CONFIG_SHORT_ERROR_STR
NULL;
nullptr;
#else
DescribeErrorPOSIX(err);
#endif
Expand Down Expand Up @@ -178,9 +178,9 @@ DLL_EXPORT const char * DescribeErrorLwIP(CHIP_ERROR aError)
/**
* Register a text error formatter for LwIP errors.
*/
void RegisterLwIPErrorFormatter(void)
void RegisterLwIPErrorFormatter()
{
static ErrorFormatter sLwIPErrorFormatter = { FormatLwIPError, NULL };
static ErrorFormatter sLwIPErrorFormatter = { FormatLwIPError, nullptr };

RegisterErrorFormatter(&sLwIPErrorFormatter);
}
Expand All @@ -203,17 +203,14 @@ bool FormatLwIPError(char * buf, uint16_t bufSize, CHIP_ERROR err)
{
const char * desc =
#if CHIP_CONFIG_SHORT_ERROR_STR
NULL;
nullptr;
#else
DescribeErrorLwIP(err);
#endif
chip::FormatError(buf, bufSize, "LwIP", err, desc);
return true;
}
else
{
return false;
}
return false;
}

#endif // CHIP_SYSTEM_CONFIG_USE_LWIP
Expand Down
Loading