Skip to content

Commit d5ca8db

Browse files
restyled-commitsnivi-apple
authored andcommitted
Restyled by clang-format
1 parent 2ad1506 commit d5ca8db

File tree

2 files changed

+25
-26
lines changed

2 files changed

+25
-26
lines changed

src/platform/Darwin/DnssdContexts.cpp

+19-18
Original file line numberDiff line numberDiff line change
@@ -458,29 +458,30 @@ ResolveContext::ResolveContext(void * cbContext, DnssdResolveCallback cb, chip::
458458
std::shared_ptr<uint32_t> && consumerCounterToUse) :
459459
browseThatCausedResolve(browseCausingResolve)
460460
{
461-
type = ContextType::Resolve;
462-
context = cbContext;
463-
callback = cb;
464-
protocol = GetProtocol(cbAddressType);
465-
instanceName = instanceNameToResolve;
466-
consumerCounter = std::move(consumerCounterToUse);
461+
type = ContextType::Resolve;
462+
context = cbContext;
463+
callback = cb;
464+
protocol = GetProtocol(cbAddressType);
465+
instanceName = instanceNameToResolve;
466+
consumerCounter = std::move(consumerCounterToUse);
467467
hasSrpTimerStarted = false;
468468
}
469469

470470
ResolveContext::ResolveContext(CommissioningResolveDelegate * delegate, chip::Inet::IPAddressType cbAddressType,
471471
const char * instanceNameToResolve, std::shared_ptr<uint32_t> && consumerCounterToUse) :
472472
browseThatCausedResolve(nullptr)
473473
{
474-
type = ContextType::Resolve;
475-
context = delegate;
476-
callback = nullptr;
477-
protocol = GetProtocol(cbAddressType);
478-
instanceName = instanceNameToResolve;
479-
consumerCounter = std::move(consumerCounterToUse);
474+
type = ContextType::Resolve;
475+
context = delegate;
476+
callback = nullptr;
477+
protocol = GetProtocol(cbAddressType);
478+
instanceName = instanceNameToResolve;
479+
consumerCounter = std::move(consumerCounterToUse);
480480
hasSrpTimerStarted = false;
481481
}
482482

483-
ResolveContext::~ResolveContext() {
483+
ResolveContext::~ResolveContext()
484+
{
484485
if (this->hasSrpTimerStarted)
485486
{
486487
CancelSrpTimer(this);
@@ -576,13 +577,13 @@ bool ResolveContext::TryReportingResultsForInterfaceIndex(uint32_t interfaceInde
576577
}
577578

578579
std::map<std::pair<uint32_t, std::string>, InterfaceInfo>::iterator iter = interfaces.begin();
579-
while (iter != interfaces.end())
580-
{
581-
std::pair<uint32_t, std::string> key = iter->first;
580+
while (iter != interfaces.end())
581+
{
582+
std::pair<uint32_t, std::string> key = iter->first;
582583
if (key.first == interfaceIndex)
583584
{
584-
auto & interface = interfaces[key];
585-
auto & ips = interface.addresses;
585+
auto & interface = interfaces[key];
586+
auto & ips = interface.addresses;
586587

587588
// Some interface may not have any ips, just ignore them.
588589
if (ips.size() == 0)

src/platform/Darwin/DnssdImpl.cpp

+6-8
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ CHIP_ERROR StartSrpTimer(uint16_t timeoutInMSecs, ResolveContext * ctx)
182182
{
183183
VerifyOrReturnValue(ctx != nullptr, CHIP_ERROR_INCORRECT_STATE);
184184
return DeviceLayer::SystemLayer().StartTimer(System::Clock::Milliseconds16(timeoutInMSecs), SrpTimerExpiredCallback,
185-
reinterpret_cast<void *>(ctx));
185+
reinterpret_cast<void *>(ctx));
186186
}
187187

188188
/**
@@ -195,7 +195,6 @@ void CancelSrpTimer(ResolveContext * ctx)
195195
DeviceLayer::SystemLayer().CancelTimer(SrpTimerExpiredCallback, reinterpret_cast<void *>(ctx));
196196
}
197197

198-
199198
Global<MdnsContexts> MdnsContexts::sInstance;
200199

201200
namespace {
@@ -261,7 +260,7 @@ CHIP_ERROR Browse(BrowseHandler * sdCtx, uint32_t interfaceId, const char * type
261260
ChipLogProgress(Discovery, "Browsing for: %s on domain %s", StringOrNullMarker(type), kSrpDot);
262261

263262
auto sdRefSrp = sdCtx->serviceRef; // Mandatory copy because of kDNSServiceFlagsShareConnection
264-
err = DNSServiceBrowse(&sdRefSrp, kBrowseFlags, interfaceId, type, kSrpDot, OnBrowse, sdCtx);
263+
err = DNSServiceBrowse(&sdRefSrp, kBrowseFlags, interfaceId, type, kSrpDot, OnBrowse, sdCtx);
265264
VerifyOrReturnError(kDNSServiceErr_NoError == err, sdCtx->Finalize(err));
266265

267266
return MdnsContexts::GetInstance().Add(sdCtx, sdCtx->serviceRef);
@@ -323,9 +322,8 @@ static void OnGetAddrInfo(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t i
323322
}
324323
else if (domainName.compare(kLocalDot) == 0)
325324
{
326-
ChipLogProgress(
327-
Discovery,
328-
"Mdns: Resolve completed on the local domain. Starting a timer for the srp resolve to come back");
325+
ChipLogProgress(Discovery,
326+
"Mdns: Resolve completed on the local domain. Starting a timer for the srp resolve to come back");
329327

330328
// Usually the resolution on the local domain is quicker than on the srp domain. We would like to give the
331329
// resolution on the srp domain around 250 millisecs more to give it a chance to resolve before finalizing
@@ -383,7 +381,7 @@ static void OnResolve(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t inter
383381
if (!sdCtx->isResolveRequested)
384382
{
385383
GetAddrInfo(sdCtx);
386-
sdCtx->isResolveRequested = true;
384+
sdCtx->isResolveRequested = true;
387385
}
388386
}
389387
}
@@ -403,7 +401,7 @@ static CHIP_ERROR Resolve(ResolveContext * sdCtx, uint32_t interfaceId, chip::In
403401
VerifyOrReturnError(kDNSServiceErr_NoError == err, sdCtx->Finalize(err));
404402

405403
auto sdRefSrp = sdCtx->serviceRef; // Mandatory copy because of kDNSServiceFlagsShareConnection
406-
err = DNSServiceResolve(&sdRefSrp, kResolveFlags, interfaceId, name, type, kSrpDot, OnResolve, sdCtx);
404+
err = DNSServiceResolve(&sdRefSrp, kResolveFlags, interfaceId, name, type, kSrpDot, OnResolve, sdCtx);
407405
VerifyOrReturnError(kDNSServiceErr_NoError == err, sdCtx->Finalize(err));
408406

409407
auto retval = MdnsContexts::GetInstance().Add(sdCtx, sdCtx->serviceRef);

0 commit comments

Comments
 (0)