Restyled by clang-format

restyled-commits · woody-apple · commit 19ccdba8c024 · 2024-07-29T15:16:58.000-07:00
diff --git a/examples/platform/linux/AppMain.cpp b/examples/platform/linux/AppMain.cpp
@@ -482,7 +482,7 @@ int ChipLinuxAppInit(int argc, char * const argv[], OptionSet * customOptions,
         {
             ChipLogProgress(NotSpecified, "Wi-Fi Management started");
             DeviceLayer::ConnectivityManager::WiFiPAFAdvertiseParam args;
-            args.enable = LinuxDeviceOptions::GetInstance().mWiFiPAF;
+            args.enable  = LinuxDeviceOptions::GetInstance().mWiFiPAF;
             args.ExtCmds = LinuxDeviceOptions::GetInstance().mWiFiPafExtCmds;
             DeviceLayer::ConnectivityMgr().SetWiFiPAFAdvertisingEnabled(args);
         }
diff --git a/examples/platform/linux/Options.cpp b/examples/platform/linux/Options.cpp
@@ -603,7 +603,7 @@ bool HandleOption(const char * aProgram, OptionSet * aOptions, int aIdentifier,
 #endif
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
     case kDeviceOption_WiFi_PAF: {
-        LinuxDeviceOptions::GetInstance().mWiFiPAF = true;
+        LinuxDeviceOptions::GetInstance().mWiFiPAF        = true;
         LinuxDeviceOptions::GetInstance().mWiFiPafExtCmds = aValue;
         break;
     }
diff --git a/examples/platform/linux/Options.h b/examples/platform/linux/Options.h
@@ -50,7 +50,7 @@ struct LinuxDeviceOptions
     bool mWiFi                 = false;
     bool mThread               = false;
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
-    bool mWiFiPAF = false;
+    bool mWiFiPAF                = false;
     const char * mWiFiPafExtCmds = nullptr;
 #endif
 #if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE || CHIP_DEVICE_ENABLE_PORT_PARAMS
diff --git a/src/app/server/CommissioningWindowManager.cpp b/src/app/server/CommissioningWindowManager.cpp
@@ -74,7 +74,7 @@ void CommissioningWindowManager::OnPlatformEvent(const DeviceLayer::ChipDeviceEv
 #endif
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
         DeviceLayer::ConnectivityManager::WiFiPAFAdvertiseParam args;
-        args.enable = false;
+        args.enable  = false;
         args.ExtCmds = nullptr;
         DeviceLayer::ConnectivityMgr().SetWiFiPAFAdvertisingEnabled(args);
 #endif
diff --git a/src/include/platform/ConnectivityManager.h b/src/include/platform/ConnectivityManager.h
@@ -177,7 +177,7 @@ class ConnectivityManager
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
     struct WiFiPAFAdvertiseParam;
 
-    CHIP_ERROR SetWiFiPAFAdvertisingEnabled(WiFiPAFAdvertiseParam &args);
+    CHIP_ERROR SetWiFiPAFAdvertisingEnabled(WiFiPAFAdvertiseParam & args);
     typedef void (*OnConnectionCompleteFunct)(void * appState);
     typedef void (*OnConnectionErrorFunct)(void * appState, CHIP_ERROR err);
     CHIP_ERROR WiFiPAFConnect(const SetupDiscriminator & connDiscriminator, void * appState, OnConnectionCompleteFunct onSuccess,
@@ -288,12 +288,11 @@ struct ConnectivityManager::WiFiPAFAdvertiseParam
 {
     /* To enable/disable WiFiPAF Commissioning */
     bool enable;
-	/* The optional commands */
-	const char* ExtCmds;
+    /* The optional commands */
+    const char * ExtCmds;
 };
 #endif
 
-
 /**
  * Returns a reference to the public interface of the ConnectivityManager singleton object.
  *
@@ -434,7 +433,7 @@ inline CHIP_ERROR ConnectivityManager::GetAndLogWiFiStatsCounters()
 }
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
-inline CHIP_ERROR ConnectivityManager::SetWiFiPAFAdvertisingEnabled(WiFiPAFAdvertiseParam &args)
+inline CHIP_ERROR ConnectivityManager::SetWiFiPAFAdvertisingEnabled(WiFiPAFAdvertiseParam & args)
 {
     return static_cast<ImplClass *>(this)->_SetWiFiPAFAdvertisingEnabled(args);
 }
diff --git a/src/platform/Linux/ConnectivityManagerImpl.cpp b/src/platform/Linux/ConnectivityManagerImpl.cpp
@@ -837,7 +837,7 @@ struct PAFPublishSSI
     uint16_t VendorId;
 };
 #pragma pack(pop)
-CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFPublish(ConnectivityManager::WiFiPAFAdvertiseParam &InArgs)
+CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFPublish(ConnectivityManager::WiFiPAFAdvertiseParam & InArgs)
 {
     CHIP_ERROR ret;
     GAutoPtr<GError> err;
@@ -846,11 +846,13 @@ CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFPublish(ConnectivityManager::WiFiPAF
     size_t req_len;
 
     snprintf(args, sizeof(args), "service_name=%s srv_proto_type=%u ttl=%u ", srv_name, NAN_SRV_PROTO_MATTER, NAM_PUBLISH_PERIOD);
-    req_len = strlen(args)+strlen(InArgs.ExtCmds);
-    if ((InArgs.ExtCmds != nullptr) &&
-        (MAX_PAF_PUBLISH_SSI_BUFLEN > req_len)) {
+    req_len = strlen(args) + strlen(InArgs.ExtCmds);
+    if ((InArgs.ExtCmds != nullptr) && (MAX_PAF_PUBLISH_SSI_BUFLEN > req_len))
+    {
         strcat(args, InArgs.ExtCmds);
-    } else {
+    }
+    else
+    {
         ChipLogError(DeviceLayer, "Input cmd is too long: limit:%d, req: %lu", MAX_PAF_PUBLISH_SSI_BUFLEN, req_len);
     }
 
@@ -868,7 +870,8 @@ CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFPublish(ConnectivityManager::WiFiPAF
     {
         PafPublish_ssi.VendorId = 0;
     }
-    if (MAX_PAF_PUBLISH_SSI_BUFLEN > strlen(args)+strlen(NAN_PUBLISH_SSI_TAG)) {
+    if (MAX_PAF_PUBLISH_SSI_BUFLEN > strlen(args) + strlen(NAN_PUBLISH_SSI_TAG))
+    {
         strcat(args, NAN_PUBLISH_SSI_TAG);
     }
     ret = Encoding::BytesToUppercaseHexString((uint8_t *) &PafPublish_ssi, sizeof(PafPublish_ssi), &args[strlen(args)],
@@ -897,7 +900,7 @@ CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFCancelPublish()
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR ConnectivityManagerImpl::_SetWiFiPAFAdvertisingEnabled(WiFiPAFAdvertiseParam &args)
+CHIP_ERROR ConnectivityManagerImpl::_SetWiFiPAFAdvertisingEnabled(WiFiPAFAdvertiseParam & args)
 {
     if (args.enable == true)
     {
diff --git a/src/platform/Linux/ConnectivityManagerImpl.h b/src/platform/Linux/ConnectivityManagerImpl.h
@@ -250,8 +250,8 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
     OnConnectionErrorFunct mOnPafSubscribeError;
     Transport::WiFiPAFBase * pmWiFiPAF;
     void * mAppState;
-    CHIP_ERROR _SetWiFiPAFAdvertisingEnabled(WiFiPAFAdvertiseParam &args);
-    CHIP_ERROR _WiFiPAFPublish(WiFiPAFAdvertiseParam &args);
+    CHIP_ERROR _SetWiFiPAFAdvertisingEnabled(WiFiPAFAdvertiseParam & args);
+    CHIP_ERROR _WiFiPAFPublish(WiFiPAFAdvertiseParam & args);
     CHIP_ERROR _WiFiPAFCancelPublish();
 #endif
 
diff --git a/src/setup_payload/tests/TestQRCode.cpp b/src/setup_payload/tests/TestQRCode.cpp
@@ -65,8 +65,8 @@ TEST(TestQRCode, TestRendezvousFlags)
     EXPECT_TRUE(CheckWriteRead(inPayload));
 
     inPayload.rendezvousInformation.SetValue(
-            RendezvousInformationFlags(RendezvousInformationFlag::kWiFiPAF, RendezvousInformationFlag::kOnNetwork));
-        EXPECT_TRUE(CheckWriteRead(inPayload));
+        RendezvousInformationFlags(RendezvousInformationFlag::kWiFiPAF, RendezvousInformationFlag::kOnNetwork));
+    EXPECT_TRUE(CheckWriteRead(inPayload));
 
     inPayload.rendezvousInformation.SetValue(RendezvousInformationFlags(
         RendezvousInformationFlag::kBLE, RendezvousInformationFlag::kSoftAP, RendezvousInformationFlag::kOnNetwork));
@@ -78,9 +78,9 @@ TEST(TestQRCode, TestRendezvousFlags)
     inPayload.rendezvousInformation.SetValue(RendezvousInformationFlags(
         RendezvousInformationFlag::kWiFiPAF, RendezvousInformationFlag::kBLE, RendezvousInformationFlag::kOnNetwork));
 
-    inPayload.rendezvousInformation.SetValue(RendezvousInformationFlags(
-        RendezvousInformationFlag::kWiFiPAF, RendezvousInformationFlag::kBLE, RendezvousInformationFlag::kSoftAP,
-        RendezvousInformationFlag::kOnNetwork));
+    inPayload.rendezvousInformation.SetValue(
+        RendezvousInformationFlags(RendezvousInformationFlag::kWiFiPAF, RendezvousInformationFlag::kBLE,
+                                   RendezvousInformationFlag::kSoftAP, RendezvousInformationFlag::kOnNetwork));
 
     EXPECT_TRUE(CheckWriteRead(inPayload));
 }
@@ -107,8 +107,9 @@ TEST(TestQRCode, TestMaximumValues)
     inPayload.vendorID          = 0xFFFF;
     inPayload.productID         = 0xFFFF;
     inPayload.commissioningFlow = CommissioningFlow::kCustom;
-    inPayload.rendezvousInformation.SetValue(RendezvousInformationFlags(
-        RendezvousInformationFlag::kWiFiPAF, RendezvousInformationFlag::kBLE, RendezvousInformationFlag::kSoftAP, RendezvousInformationFlag::kOnNetwork));
+    inPayload.rendezvousInformation.SetValue(
+        RendezvousInformationFlags(RendezvousInformationFlag::kWiFiPAF, RendezvousInformationFlag::kBLE,
+                                   RendezvousInformationFlag::kSoftAP, RendezvousInformationFlag::kOnNetwork));
     inPayload.discriminator.SetLongValue(static_cast<uint16_t>((1 << kPayloadDiscriminatorFieldLengthInBits) - 1));
     inPayload.setUpPINCode = static_cast<uint32_t>((1 << kSetupPINCodeFieldLengthInBits) - 1);
 

Original file line number	Diff line number	Diff line change
`@@ -482,7 +482,7 @@ int ChipLinuxAppInit(int argc, char * const argv[], OptionSet * customOptions,`
`482`	`482`	`{`
`483`	`483`	`ChipLogProgress(NotSpecified, "Wi-Fi Management started");`
`484`	`484`	`DeviceLayer::ConnectivityManager::WiFiPAFAdvertiseParam args;`
`485`		`- args.enable = LinuxDeviceOptions::GetInstance().mWiFiPAF;`
	`485`	`+ args.enable = LinuxDeviceOptions::GetInstance().mWiFiPAF;`
`486`	`486`	`args.ExtCmds = LinuxDeviceOptions::GetInstance().mWiFiPafExtCmds;`
`487`	`487`	`DeviceLayer::ConnectivityMgr().SetWiFiPAFAdvertisingEnabled(args);`
`488`	`488`	`}`
Original file line number	Diff line number	Diff line change
`@@ -603,7 +603,7 @@ bool HandleOption(const char * aProgram, OptionSet * aOptions, int aIdentifier,`
`603`	`603`	`#endif`
`604`	`604`	`#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF`
`605`	`605`	`case kDeviceOption_WiFi_PAF: {`
`606`		`- LinuxDeviceOptions::GetInstance().mWiFiPAF = true;`
	`606`	`+ LinuxDeviceOptions::GetInstance().mWiFiPAF = true;`
`607`	`607`	`LinuxDeviceOptions::GetInstance().mWiFiPafExtCmds = aValue;`
`608`	`608`	`break;`
`609`	`609`	`}`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ class ConnectivityManager`
`177`	`177`	`#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF`
`178`	`178`	`struct WiFiPAFAdvertiseParam;`
`179`	`179`
`180`		`- CHIP_ERROR SetWiFiPAFAdvertisingEnabled(WiFiPAFAdvertiseParam &args);`
	`180`	`+ CHIP_ERROR SetWiFiPAFAdvertisingEnabled(WiFiPAFAdvertiseParam & args);`
`181`	`181`	`typedef void (OnConnectionCompleteFunct)(void appState);`
`182`	`182`	`typedef void (OnConnectionErrorFunct)(void appState, CHIP_ERROR err);`
`183`	`183`	`CHIP_ERROR WiFiPAFConnect(const SetupDiscriminator & connDiscriminator, void * appState, OnConnectionCompleteFunct onSuccess,`
`@@ -288,12 +288,11 @@ struct ConnectivityManager::WiFiPAFAdvertiseParam`
`288`	`288`	`{`
`289`	`289`	`/* To enable/disable WiFiPAF Commissioning */`
`290`	`290`	`bool enable;`
`291`		`- /* The optional commands */`
`292`		`- const char* ExtCmds;`
	`291`	`+ /* The optional commands */`
	`292`	`+ const char * ExtCmds;`
`293`	`293`	`};`
`294`	`294`	`#endif`
`295`	`295`
`296`		`-`
`297`	`296`	`/**`
`298`	`297`	`* Returns a reference to the public interface of the ConnectivityManager singleton object.`
`299`	`298`	`*`
`@@ -434,7 +433,7 @@ inline CHIP_ERROR ConnectivityManager::GetAndLogWiFiStatsCounters()`
`434`	`433`	`}`
`435`	`434`
`436`	`435`	`#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF`
`437`		`-inline CHIP_ERROR ConnectivityManager::SetWiFiPAFAdvertisingEnabled(WiFiPAFAdvertiseParam &args)`
	`436`	`+inline CHIP_ERROR ConnectivityManager::SetWiFiPAFAdvertisingEnabled(WiFiPAFAdvertiseParam & args)`
`438`	`437`	`{`
`439`	`438`	`return static_cast<ImplClass *>(this)->_SetWiFiPAFAdvertisingEnabled(args);`
`440`	`439`	`}`
Original file line number	Diff line number	Diff line change
`@@ -837,7 +837,7 @@ struct PAFPublishSSI`
`837`	`837`	`uint16_t VendorId;`
`838`	`838`	`};`
`839`	`839`	`#pragma pack(pop)`
`840`		`-CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFPublish(ConnectivityManager::WiFiPAFAdvertiseParam &InArgs)`
	`840`	`+CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFPublish(ConnectivityManager::WiFiPAFAdvertiseParam & InArgs)`
`841`	`841`	`{`
`842`	`842`	`CHIP_ERROR ret;`
`843`	`843`	`GAutoPtr<GError> err;`
`@@ -846,11 +846,13 @@ CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFPublish(ConnectivityManager::WiFiPAF`
`846`	`846`	`size_t req_len;`
`847`	`847`
`848`	`848`	`snprintf(args, sizeof(args), "service_name=%s srv_proto_type=%u ttl=%u ", srv_name, NAN_SRV_PROTO_MATTER, NAM_PUBLISH_PERIOD);`
`849`		`- req_len = strlen(args)+strlen(InArgs.ExtCmds);`
`850`		`- if ((InArgs.ExtCmds != nullptr) &&`
`851`		`- (MAX_PAF_PUBLISH_SSI_BUFLEN > req_len)) {`
	`849`	`+ req_len = strlen(args) + strlen(InArgs.ExtCmds);`
	`850`	`+ if ((InArgs.ExtCmds != nullptr) && (MAX_PAF_PUBLISH_SSI_BUFLEN > req_len))`
	`851`	`+ {`
`852`	`852`	`strcat(args, InArgs.ExtCmds);`
`853`		`- } else {`
	`853`	`+ }`
	`854`	`+ else`
	`855`	`+ {`
`854`	`856`	`ChipLogError(DeviceLayer, "Input cmd is too long: limit:%d, req: %lu", MAX_PAF_PUBLISH_SSI_BUFLEN, req_len);`
`855`	`857`	`}`
`856`	`858`
`@@ -868,7 +870,8 @@ CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFPublish(ConnectivityManager::WiFiPAF`
`868`	`870`	`{`
`869`	`871`	`PafPublish_ssi.VendorId = 0;`
`870`	`872`	`}`
`871`		`- if (MAX_PAF_PUBLISH_SSI_BUFLEN > strlen(args)+strlen(NAN_PUBLISH_SSI_TAG)) {`
	`873`	`+ if (MAX_PAF_PUBLISH_SSI_BUFLEN > strlen(args) + strlen(NAN_PUBLISH_SSI_TAG))`
	`874`	`+ {`
`872`	`875`	`strcat(args, NAN_PUBLISH_SSI_TAG);`
`873`	`876`	`}`
`874`	`877`	`ret = Encoding::BytesToUppercaseHexString((uint8_t *) &PafPublish_ssi, sizeof(PafPublish_ssi), &args[strlen(args)],`
`@@ -897,7 +900,7 @@ CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFCancelPublish()`
`897`	`900`	`return CHIP_NO_ERROR;`
`898`	`901`	`}`
`899`	`902`
`900`		`-CHIP_ERROR ConnectivityManagerImpl::_SetWiFiPAFAdvertisingEnabled(WiFiPAFAdvertiseParam &args)`
	`903`	`+CHIP_ERROR ConnectivityManagerImpl::_SetWiFiPAFAdvertisingEnabled(WiFiPAFAdvertiseParam & args)`
`901`	`904`	`{`
`902`	`905`	`if (args.enable == true)`
`903`	`906`	`{`