From c30d3b7baec36bf967952e711cd0b1b20f530531 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Wed, 5 Mar 2025 15:54:07 -0500 Subject: [PATCH 1/2] Darwin style update: remove extra namespace prefixes --- src/platform/Darwin/DnssdHostNameRegistrar.cpp | 2 +- src/platform/Darwin/NetworkCommissioningDriver.h | 2 +- src/platform/Darwin/WiFi/ConnectivityManagerImplWiFi.mm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/platform/Darwin/DnssdHostNameRegistrar.cpp b/src/platform/Darwin/DnssdHostNameRegistrar.cpp index 3847a024ea4623..a01973bb088fb9 100644 --- a/src/platform/Darwin/DnssdHostNameRegistrar.cpp +++ b/src/platform/Darwin/DnssdHostNameRegistrar.cpp @@ -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); diff --git a/src/platform/Darwin/NetworkCommissioningDriver.h b/src/platform/Darwin/NetworkCommissioningDriver.h index ff87d6cf6fa02c..756fa298a01ef1 100644 --- a/src/platform/Darwin/NetworkCommissioningDriver.h +++ b/src/platform/Darwin/NetworkCommissioningDriver.h @@ -49,7 +49,7 @@ class DarwinNetworkIterator : public NetworkIterator protected: size_t mInterfaceCount = 0; - char mInterfaceName[chip::Inet::InterfaceId::kMaxIfNameLength] = {}; + char mInterfaceName[Inet::InterfaceId::kMaxIfNameLength] = {}; bool mInterfaceStatus = false; }; diff --git a/src/platform/Darwin/WiFi/ConnectivityManagerImplWiFi.mm b/src/platform/Darwin/WiFi/ConnectivityManagerImplWiFi.mm index 46e0e7a3521373..a5f1db9655c6a8 100644 --- a/src/platform/Darwin/WiFi/ConnectivityManagerImplWiFi.mm +++ b/src/platform/Darwin/WiFi/ConnectivityManagerImplWiFi.mm @@ -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); } From cd001e0376949ef25897bcd35fb5183617571415 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Wed, 5 Mar 2025 20:55:40 +0000 Subject: [PATCH 2/2] Restyled by clang-format --- src/platform/Darwin/NetworkCommissioningDriver.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platform/Darwin/NetworkCommissioningDriver.h b/src/platform/Darwin/NetworkCommissioningDriver.h index 756fa298a01ef1..1a7f7d64152153 100644 --- a/src/platform/Darwin/NetworkCommissioningDriver.h +++ b/src/platform/Darwin/NetworkCommissioningDriver.h @@ -48,9 +48,9 @@ class DarwinNetworkIterator : public NetworkIterator void Release() override { delete this; } protected: - size_t mInterfaceCount = 0; + size_t mInterfaceCount = 0; char mInterfaceName[Inet::InterfaceId::kMaxIfNameLength] = {}; - bool mInterfaceStatus = false; + bool mInterfaceStatus = false; }; class DarwinEthernetNetworkIterator final : public DarwinNetworkIterator