Skip to content

Commit 19ccdba

Browse files
restyled-commitswoody-apple
restyled-commits
authored and
woody-apple
committed
Restyled by clang-format
1 parent 30542c4 commit 19ccdba

File tree

8 files changed

+28
-25
lines changed

8 files changed

+28
-25
lines changed

‎examples/platform/linux/AppMain.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ int ChipLinuxAppInit(int argc, char * const argv[], OptionSet * customOptions,
482482
{
483483
ChipLogProgress(NotSpecified, "Wi-Fi Management started");
484484
DeviceLayer::ConnectivityManager::WiFiPAFAdvertiseParam args;
485-
args.enable = LinuxDeviceOptions::GetInstance().mWiFiPAF;
485+
args.enable = LinuxDeviceOptions::GetInstance().mWiFiPAF;
486486
args.ExtCmds = LinuxDeviceOptions::GetInstance().mWiFiPafExtCmds;
487487
DeviceLayer::ConnectivityMgr().SetWiFiPAFAdvertisingEnabled(args);
488488
}

‎examples/platform/linux/Options.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ bool HandleOption(const char * aProgram, OptionSet * aOptions, int aIdentifier,
603603
#endif
604604
#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
605605
case kDeviceOption_WiFi_PAF: {
606-
LinuxDeviceOptions::GetInstance().mWiFiPAF = true;
606+
LinuxDeviceOptions::GetInstance().mWiFiPAF = true;
607607
LinuxDeviceOptions::GetInstance().mWiFiPafExtCmds = aValue;
608608
break;
609609
}

‎examples/platform/linux/Options.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ struct LinuxDeviceOptions
5050
bool mWiFi = false;
5151
bool mThread = false;
5252
#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
53-
bool mWiFiPAF = false;
53+
bool mWiFiPAF = false;
5454
const char * mWiFiPafExtCmds = nullptr;
5555
#endif
5656
#if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE || CHIP_DEVICE_ENABLE_PORT_PARAMS

‎src/app/server/CommissioningWindowManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void CommissioningWindowManager::OnPlatformEvent(const DeviceLayer::ChipDeviceEv
7474
#endif
7575
#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
7676
DeviceLayer::ConnectivityManager::WiFiPAFAdvertiseParam args;
77-
args.enable = false;
77+
args.enable = false;
7878
args.ExtCmds = nullptr;
7979
DeviceLayer::ConnectivityMgr().SetWiFiPAFAdvertisingEnabled(args);
8080
#endif

‎src/include/platform/ConnectivityManager.h

+4-5
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ class ConnectivityManager
177177
#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
178178
struct WiFiPAFAdvertiseParam;
179179

180-
CHIP_ERROR SetWiFiPAFAdvertisingEnabled(WiFiPAFAdvertiseParam &args);
180+
CHIP_ERROR SetWiFiPAFAdvertisingEnabled(WiFiPAFAdvertiseParam & args);
181181
typedef void (*OnConnectionCompleteFunct)(void * appState);
182182
typedef void (*OnConnectionErrorFunct)(void * appState, CHIP_ERROR err);
183183
CHIP_ERROR WiFiPAFConnect(const SetupDiscriminator & connDiscriminator, void * appState, OnConnectionCompleteFunct onSuccess,
@@ -288,12 +288,11 @@ struct ConnectivityManager::WiFiPAFAdvertiseParam
288288
{
289289
/* To enable/disable WiFiPAF Commissioning */
290290
bool enable;
291-
/* The optional commands */
292-
const char* ExtCmds;
291+
/* The optional commands */
292+
const char * ExtCmds;
293293
};
294294
#endif
295295

296-
297296
/**
298297
* Returns a reference to the public interface of the ConnectivityManager singleton object.
299298
*
@@ -434,7 +433,7 @@ inline CHIP_ERROR ConnectivityManager::GetAndLogWiFiStatsCounters()
434433
}
435434

436435
#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
437-
inline CHIP_ERROR ConnectivityManager::SetWiFiPAFAdvertisingEnabled(WiFiPAFAdvertiseParam &args)
436+
inline CHIP_ERROR ConnectivityManager::SetWiFiPAFAdvertisingEnabled(WiFiPAFAdvertiseParam & args)
438437
{
439438
return static_cast<ImplClass *>(this)->_SetWiFiPAFAdvertisingEnabled(args);
440439
}

‎src/platform/Linux/ConnectivityManagerImpl.cpp

+10-7
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,7 @@ struct PAFPublishSSI
837837
uint16_t VendorId;
838838
};
839839
#pragma pack(pop)
840-
CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFPublish(ConnectivityManager::WiFiPAFAdvertiseParam &InArgs)
840+
CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFPublish(ConnectivityManager::WiFiPAFAdvertiseParam & InArgs)
841841
{
842842
CHIP_ERROR ret;
843843
GAutoPtr<GError> err;
@@ -846,11 +846,13 @@ CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFPublish(ConnectivityManager::WiFiPAF
846846
size_t req_len;
847847

848848
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+
{
852852
strcat(args, InArgs.ExtCmds);
853-
} else {
853+
}
854+
else
855+
{
854856
ChipLogError(DeviceLayer, "Input cmd is too long: limit:%d, req: %lu", MAX_PAF_PUBLISH_SSI_BUFLEN, req_len);
855857
}
856858

@@ -868,7 +870,8 @@ CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFPublish(ConnectivityManager::WiFiPAF
868870
{
869871
PafPublish_ssi.VendorId = 0;
870872
}
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+
{
872875
strcat(args, NAN_PUBLISH_SSI_TAG);
873876
}
874877
ret = Encoding::BytesToUppercaseHexString((uint8_t *) &PafPublish_ssi, sizeof(PafPublish_ssi), &args[strlen(args)],
@@ -897,7 +900,7 @@ CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFCancelPublish()
897900
return CHIP_NO_ERROR;
898901
}
899902

900-
CHIP_ERROR ConnectivityManagerImpl::_SetWiFiPAFAdvertisingEnabled(WiFiPAFAdvertiseParam &args)
903+
CHIP_ERROR ConnectivityManagerImpl::_SetWiFiPAFAdvertisingEnabled(WiFiPAFAdvertiseParam & args)
901904
{
902905
if (args.enable == true)
903906
{

‎src/platform/Linux/ConnectivityManagerImpl.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
250250
OnConnectionErrorFunct mOnPafSubscribeError;
251251
Transport::WiFiPAFBase * pmWiFiPAF;
252252
void * mAppState;
253-
CHIP_ERROR _SetWiFiPAFAdvertisingEnabled(WiFiPAFAdvertiseParam &args);
254-
CHIP_ERROR _WiFiPAFPublish(WiFiPAFAdvertiseParam &args);
253+
CHIP_ERROR _SetWiFiPAFAdvertisingEnabled(WiFiPAFAdvertiseParam & args);
254+
CHIP_ERROR _WiFiPAFPublish(WiFiPAFAdvertiseParam & args);
255255
CHIP_ERROR _WiFiPAFCancelPublish();
256256
#endif
257257

‎src/setup_payload/tests/TestQRCode.cpp

+8-7
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ TEST(TestQRCode, TestRendezvousFlags)
6565
EXPECT_TRUE(CheckWriteRead(inPayload));
6666

6767
inPayload.rendezvousInformation.SetValue(
68-
RendezvousInformationFlags(RendezvousInformationFlag::kWiFiPAF, RendezvousInformationFlag::kOnNetwork));
69-
EXPECT_TRUE(CheckWriteRead(inPayload));
68+
RendezvousInformationFlags(RendezvousInformationFlag::kWiFiPAF, RendezvousInformationFlag::kOnNetwork));
69+
EXPECT_TRUE(CheckWriteRead(inPayload));
7070

7171
inPayload.rendezvousInformation.SetValue(RendezvousInformationFlags(
7272
RendezvousInformationFlag::kBLE, RendezvousInformationFlag::kSoftAP, RendezvousInformationFlag::kOnNetwork));
@@ -78,9 +78,9 @@ TEST(TestQRCode, TestRendezvousFlags)
7878
inPayload.rendezvousInformation.SetValue(RendezvousInformationFlags(
7979
RendezvousInformationFlag::kWiFiPAF, RendezvousInformationFlag::kBLE, RendezvousInformationFlag::kOnNetwork));
8080

81-
inPayload.rendezvousInformation.SetValue(RendezvousInformationFlags(
82-
RendezvousInformationFlag::kWiFiPAF, RendezvousInformationFlag::kBLE, RendezvousInformationFlag::kSoftAP,
83-
RendezvousInformationFlag::kOnNetwork));
81+
inPayload.rendezvousInformation.SetValue(
82+
RendezvousInformationFlags(RendezvousInformationFlag::kWiFiPAF, RendezvousInformationFlag::kBLE,
83+
RendezvousInformationFlag::kSoftAP, RendezvousInformationFlag::kOnNetwork));
8484

8585
EXPECT_TRUE(CheckWriteRead(inPayload));
8686
}
@@ -107,8 +107,9 @@ TEST(TestQRCode, TestMaximumValues)
107107
inPayload.vendorID = 0xFFFF;
108108
inPayload.productID = 0xFFFF;
109109
inPayload.commissioningFlow = CommissioningFlow::kCustom;
110-
inPayload.rendezvousInformation.SetValue(RendezvousInformationFlags(
111-
RendezvousInformationFlag::kWiFiPAF, RendezvousInformationFlag::kBLE, RendezvousInformationFlag::kSoftAP, RendezvousInformationFlag::kOnNetwork));
110+
inPayload.rendezvousInformation.SetValue(
111+
RendezvousInformationFlags(RendezvousInformationFlag::kWiFiPAF, RendezvousInformationFlag::kBLE,
112+
RendezvousInformationFlag::kSoftAP, RendezvousInformationFlag::kOnNetwork));
112113
inPayload.discriminator.SetLongValue(static_cast<uint16_t>((1 << kPayloadDiscriminatorFieldLengthInBits) - 1));
113114
inPayload.setUpPINCode = static_cast<uint32_t>((1 << kSetupPINCodeFieldLengthInBits) - 1);
114115

0 commit comments

Comments
 (0)