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.

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

Darwin style update: remove extra namespace prefixes #37888

Merged
merged 2 commits into from
Mar 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/platform/Darwin/DnssdHostNameRegistrar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ void LogDetails(InetInterfacesVector inetInterfaces, Inet6InterfacesVector inet6

for (auto interfaceId : interfaceIds)
{
char interfaceName[chip::Inet::InterfaceId::kMaxIfNameLength] = {};
char interfaceName[Inet::InterfaceId::kMaxIfNameLength] = {};
if_indextoname(interfaceId, interfaceName);
ChipLogProgress(Discovery, "\t%s (%u)", interfaceName, interfaceId);
LogDetails(interfaceId, inetInterfaces, inet6Interfaces);
Expand Down
6 changes: 3 additions & 3 deletions src/platform/Darwin/NetworkCommissioningDriver.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ class DarwinNetworkIterator : public NetworkIterator
void Release() override { delete this; }

protected:
size_t mInterfaceCount = 0;
char mInterfaceName[chip::Inet::InterfaceId::kMaxIfNameLength] = {};
bool mInterfaceStatus = false;
size_t mInterfaceCount = 0;
char mInterfaceName[Inet::InterfaceId::kMaxIfNameLength] = {};
bool mInterfaceStatus = false;
};

class DarwinEthernetNetworkIterator final : public DarwinNetworkIterator
Expand Down
2 changes: 1 addition & 1 deletion src/platform/Darwin/WiFi/ConnectivityManagerImplWiFi.mm
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
bool status = false;

if (_GetWiFiStationMode() == kWiFiStationMode_Enabled) {
char interfaceName[chip::Inet::InterfaceId::kMaxIfNameLength];
char interfaceName[Inet::InterfaceId::kMaxIfNameLength];
VerifyOrReturnError(CHIP_NO_ERROR == GetWiFiInterfaceName(interfaceName, sizeof(interfaceName)), false);
VerifyOrReturnError(CHIP_NO_ERROR == GetInterfaceStatus(interfaceName, &status), false);
}
Expand Down
Loading