Skip to content

Commit aa5ef48

Browse files
committed
Updates as per feedback
1 parent b503009 commit aa5ef48

File tree

5 files changed

+5
-6
lines changed

5 files changed

+5
-6
lines changed

examples/chip-tool/commands/common/RemoteDataModelLogger.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ CHIP_ERROR LogDiscoveredNodeData(const chip::Dnssd::CommissionNodeData & nodeDat
209209
VerifyOrReturnError(gDelegate != nullptr, CHIP_NO_ERROR);
210210

211211
auto & commissionData = nodeData;
212-
auto & resolutionData = (chip::Dnssd::CommonResolutionData &) commissionData;
212+
auto & resolutionData = commissionData;
213213

214214
if (!chip::CanCastTo<uint8_t>(resolutionData.numIPs))
215215
{

examples/chip-tool/commands/pairing/PairingCommand.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ void PairingCommand::OnDiscoveredDevice(const chip::Dnssd::CommissionNodeData &
484484
// Ignore nodes with closed commissioning window
485485
VerifyOrReturn(nodeData.commissioningMode != 0);
486486

487-
auto & resolutionData = (chip::Dnssd::CommonResolutionData &) nodeData;
487+
auto & resolutionData = nodeData;
488488

489489
const uint16_t port = resolutionData.port;
490490
char buf[chip::Inet::IPAddress::kMaxStringLength];

src/controller/SetUpCodePairer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ void SetUpCodePairer::NotifyCommissionableDeviceDiscovered(const Dnssd::Discover
387387

388388
ChipLogProgress(Controller, "Discovered device to be commissioned over DNS-SD");
389389

390-
NotifyCommissionableDeviceDiscovered((Dnssd::CommonResolutionData &) nodeData.Get<Dnssd::CommissionNodeData>());
390+
NotifyCommissionableDeviceDiscovered(nodeData.Get<Dnssd::CommissionNodeData>());
391391
}
392392

393393
void SetUpCodePairer::NotifyCommissionableDeviceDiscovered(const Dnssd::CommonResolutionData & resolutionData)

src/darwin/Framework/CHIP/MTRCommissionableBrowser.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ void OnNodeDiscovered(const DiscoveredNodeData & nodeData) override
180180
result.discriminator = @(commissionData.longDiscriminator);
181181
result.commissioningMode = commissionData.commissioningMode != 0;
182182

183-
auto & resolutionData = commissionData;
183+
const CommonResolutionData & resolutionData = commissionData;
184184
auto * interfaces = result.interfaces;
185185
interfaces[@(resolutionData.interfaceId.GetPlatformInterface())].resolutionData = chip::MakeOptional(resolutionData);
186186

src/lib/dnssd/Types.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@ struct CommissionNodeData : public CommonResolutionData
225225

226226
void Reset()
227227
{
228-
CommonResolutionData::Reset();
229228
// Let constructor clear things as default
230229
this->~CommissionNodeData();
231230
new (this) CommissionNodeData();
@@ -235,7 +234,7 @@ struct CommissionNodeData : public CommonResolutionData
235234

236235
void LogDetail() const
237236
{
238-
ChipLogDetail(Discovery, "Discovered commissionable/commissioners node:");
237+
ChipLogDetail(Discovery, "Discovered commissionable/commissioner node:");
239238
CommonResolutionData::LogDetail();
240239

241240
if (rotatingIdLen > 0)

0 commit comments

Comments
 (0)