Restyled by clang-format

Author: restyled-commits

src/controller/CHIPDeviceController.cpp

@@ -472,7 +472,7 @@ DeviceCommissioner::DeviceCommissioner() :
 DeviceCommissioner::~DeviceCommissioner()
 {
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
-    SetChkObjValid((void *)this, ObjChkAction::Clear, nullptr);
+    SetChkObjValid((void *) this, ObjChkAction::Clear, nullptr);
 #endif
 }
 
@@ -833,7 +833,7 @@ CHIP_ERROR DeviceCommissioner::EstablishPASEConnection(NodeId remoteDeviceId, Re
                 ExitNow(CHIP_ERROR_INTERNAL);
             }
             mRendezvousParametersForDeviceDiscoveredOverWiFiPAF = params;
-            SetChkObjValid((void*)this, ObjChkAction::Set, nullptr);
+            SetChkObjValid((void *) this, ObjChkAction::Set, nullptr);
             DeviceLayer::ConnectivityMgr().WiFiPAFConnect(params.GetSetupDiscriminator().value(), (void *) this,
                                                           OnWiFiPAFSubscribeComplete, OnWiFiPAFSubscribeError);
             ExitNow(CHIP_NO_ERROR);
@@ -908,49 +908,55 @@ void DeviceCommissioner::OnDiscoveredDeviceOverBleError(void * appState, CHIP_ER
 #endif // CONFIG_NETWORK_LAYER_BLE
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
-void DeviceCommissioner::SetChkObjValid(void * appObj, ObjChkAction action, bool* pIsObjValid)
+void DeviceCommissioner::SetChkObjValid(void * appObj, ObjChkAction action, bool * pIsObjValid)
 {
-    static std::vector<void*> ObjVector;
+    static std::vector<void *> ObjVector;
     bool IsObjValid = false;
 
-    switch (action) {
-        case ObjChkAction::Set: {
-            for (auto lt=ObjVector.begin(); lt!=ObjVector.end(); lt++)
+    switch (action)
+    {
+    case ObjChkAction::Set: {
+        for (auto lt = ObjVector.begin(); lt != ObjVector.end(); lt++)
+        {
+            if (*lt == appObj)
             {
-                if (*lt == appObj) {
-                    IsObjValid = true;
-                    break;
-                }
-            }
-            if (IsObjValid == false) {
-                ObjVector.push_back(appObj);
                 IsObjValid = true;
+                break;
             }
         }
-            break;
-        case ObjChkAction::Check: {
-            for (auto lt=ObjVector.begin(); lt!=ObjVector.end(); lt++)
+        if (IsObjValid == false)
+        {
+            ObjVector.push_back(appObj);
+            IsObjValid = true;
+        }
+    }
+    break;
+    case ObjChkAction::Check: {
+        for (auto lt = ObjVector.begin(); lt != ObjVector.end(); lt++)
+        {
+            if (*lt == appObj)
             {
-                if (*lt == appObj) {
-                    IsObjValid = true;
-                    break;
-                }
+                IsObjValid = true;
+                break;
             }
         }
-            break;
-        case ObjChkAction::Clear: {
-            for (auto lt=ObjVector.begin(); lt!=ObjVector.end(); lt++)
+    }
+    break;
+    case ObjChkAction::Clear: {
+        for (auto lt = ObjVector.begin(); lt != ObjVector.end(); lt++)
+        {
+            if (*lt == appObj)
             {
-                if (*lt == appObj) {
-                    // Already existed in the list => Remove it
-                    ObjVector.erase(lt);
-                    break;
-                }
+                // Already existed in the list => Remove it
+                ObjVector.erase(lt);
+                break;
             }
         }
-            break;
     }
-    if (pIsObjValid != nullptr) {
+    break;
+    }
+    if (pIsObjValid != nullptr)
+    {
         *pIsObjValid = IsObjValid;
     }
     return;
@@ -960,12 +966,13 @@ void DeviceCommissioner::OnWiFiPAFSubscribeComplete(void * appState)
 {
     bool isObjValid;
     SetChkObjValid(appState, ObjChkAction::Check, &isObjValid);
-    if (isObjValid == false) {
+    if (isObjValid == false)
+    {
         // The caller has been released.
         ChipLogError(Controller, "DeviceCommissioner has been destroyed!");
         return;
     }
-    auto self   = (DeviceCommissioner*) appState;
+    auto self   = (DeviceCommissioner *) appState;
     auto device = self->mDeviceInPASEEstablishment;
 
     if (nullptr != device && device->GetDeviceTransportType() == Transport::Type::kWiFiPAF)
@@ -984,12 +991,13 @@ void DeviceCommissioner::OnWiFiPAFSubscribeError(void * appState, CHIP_ERROR err
 {
     bool isObjValid;
     SetChkObjValid(appState, ObjChkAction::Check, &isObjValid);
-    if (isObjValid == false) {
+    if (isObjValid == false)
+    {
         // The caller has been released.
         ChipLogError(Controller, "DeviceCommissioner has been destroyed!");
         return;
     }
-    auto self   = (DeviceCommissioner*) appState;
+    auto self   = (DeviceCommissioner *) appState;
     auto device = self->mDeviceInPASEEstablishment;
 
     if (nullptr != device && device->GetDeviceTransportType() == Transport::Type::kWiFiPAF)

src/controller/CHIPDeviceController.h

@@ -822,7 +822,8 @@ class DLL_EXPORT DeviceCommissioner : public DeviceController,
                                          /* fireAndForget = */ true);
     }
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
-    enum ObjChkAction{
+    enum ObjChkAction
+    {
         Set,
         Check,
         Clear

src/controller/SetUpCodePairer.cpp

@@ -63,7 +63,7 @@ CHIP_ERROR GetPayload(const char * setUpCode, SetupPayload & payload)
 SetUpCodePairer::~SetUpCodePairer()
 {
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
-    DeviceCommissioner::SetChkObjValid((void *)this, DeviceCommissioner::ObjChkAction::Clear, nullptr);
+    DeviceCommissioner::SetChkObjValid((void *) this, DeviceCommissioner::ObjChkAction::Clear, nullptr);
 #endif
 }
 
@@ -267,9 +267,9 @@ CHIP_ERROR SetUpCodePairer::StartDiscoverOverWiFiPAF(SetupPayload & payload)
     VerifyOrReturnError(mCommissioner != nullptr, CHIP_ERROR_INCORRECT_STATE);
     mWaitingForDiscovery[kWiFiPAFTransport] = true;
 
-    DeviceCommissioner::SetChkObjValid((void*)this, DeviceCommissioner::ObjChkAction::Set, nullptr);
-    CHIP_ERROR err = DeviceLayer::ConnectivityMgr().WiFiPAFConnect(payload.discriminator, (void *) this,
-                                                                   OnWiFiPAFSubscribeComplete, OnWiFiPAFSubscribeError);
+    DeviceCommissioner::SetChkObjValid((void *) this, DeviceCommissioner::ObjChkAction::Set, nullptr);
+    CHIP_ERROR err = DeviceLayer::ConnectivityMgr().WiFiPAFConnect(payload.discriminator, (void *) this, OnWiFiPAFSubscribeComplete,
+                                                                   OnWiFiPAFSubscribeError);
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(Controller, "Commissioning discovery over WiFiPAF failed, err = %" CHIP_ERROR_FORMAT, err.Format());
@@ -401,25 +401,27 @@ void SetUpCodePairer::OnWiFiPAFSubscribeComplete(void * appState)
 {
     bool isObjValid;
     DeviceCommissioner::SetChkObjValid(appState, DeviceCommissioner::ObjChkAction::Check, &isObjValid);
-    if (isObjValid == false) {
+    if (isObjValid == false)
+    {
         // The caller has been released.
         ChipLogError(Controller, "SetUpCodePairer has been destroyed!");
         return;
     }
-    auto self = (SetUpCodePairer*) appState;
+    auto self = (SetUpCodePairer *) appState;
     self->OnDiscoveredDeviceOverWifiPAF();
 }
 
 void SetUpCodePairer::OnWiFiPAFSubscribeError(void * appState, CHIP_ERROR err)
 {
     bool isObjValid;
     DeviceCommissioner::SetChkObjValid(appState, DeviceCommissioner::ObjChkAction::Check, &isObjValid);
-    if (isObjValid == false) {
+    if (isObjValid == false)
+    {
         // The caller has been released.
         ChipLogError(Controller, "SetUpCodePairer has been destroyed!");
         return;
     }
-    auto self = (SetUpCodePairer*) appState;
+    auto self = (SetUpCodePairer *) appState;
     self->OnWifiPAFDiscoveryError(err);
 }
 #endif