Apply suggestions from code review

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>

Author: nivi-apple

src/platform/Darwin/DnssdContexts.cpp

@@ -491,7 +491,7 @@ ResolveContext::ResolveContext(CommissioningResolveDelegate * delegate, chip::In
 
 ResolveContext::~ResolveContext()
 {
-    if (this->isSRPTimerRunning)
+    if (isSRPTimerRunning)
     {
         CancelSRPTimer(this);
     }
@@ -568,7 +568,7 @@ void ResolveContext::DispatchSuccess()
     }
 }
 
-bool ResolveContext::TryReportingResultsForInterfaceIndex(uint32_t interfaceIndex, std::string hostname, bool isSRPType)
+bool ResolveContext::TryReportingResultsForInterfaceIndex(uint32_t interfaceIndex, const std::string & hostname, bool isSRPType)
 {
     if (interfaceIndex == 0)
     {
@@ -687,7 +687,7 @@ bool ResolveContext::HasAddress()
 }
 
 void ResolveContext::OnNewInterface(uint32_t interfaceId, const char * fullname, const char * hostnameWithDomain, uint16_t port,
-                                    uint16_t txtLen, const unsigned char * txtRecord, bool isSRPType)
+                                    uint16_t txtLen, const unsigned char * txtRecord, bool isFromSRPResolve)
 {
 #if CHIP_PROGRESS_LOGGING
     std::string txtString;

src/platform/Darwin/DnssdImpl.cpp

@@ -131,7 +131,7 @@ std::shared_ptr<uint32_t> GetCounterHolder(const char * name)
     return std::make_shared<uint32_t>(0);
 }
 
-bool IsSRPType(const char * domain)
+bool IsSRPDomain(const char * domain)
 {
     return strcmp(kSRPDot, domain) == 0;
 }
@@ -164,7 +164,7 @@ CHIP_ERROR StartSRPTimer(uint16_t timeoutInMSecs, ResolveContext * ctx)
 {
     VerifyOrReturnValue(ctx != nullptr, CHIP_ERROR_INCORRECT_STATE);
     return DeviceLayer::SystemLayer().StartTimer(System::Clock::Milliseconds16(timeoutInMSecs), SRPTimerExpiredCallback,
-                                                 reinterpret_cast<void *>(ctx));
+                                                 static_cast<void *>(ctx));
 }
 
 /**
@@ -174,7 +174,7 @@ CHIP_ERROR StartSRPTimer(uint16_t timeoutInMSecs, ResolveContext * ctx)
  */
 void CancelSRPTimer(ResolveContext * ctx)
 {
-    DeviceLayer::SystemLayer().CancelTimer(SRPTimerExpiredCallback, reinterpret_cast<void *>(ctx));
+    DeviceLayer::SystemLayer().CancelTimer(SRPTimerExpiredCallback, static_cast<void *>(ctx));
 }
 
 Global<MdnsContexts> MdnsContexts::sInstance;
@@ -285,7 +285,7 @@ static void OnGetAddrInfo(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t i
 
     if (kDNSServiceErr_NoError == err)
     {
-        InterfaceKey interfaceKey = { interfaceId, hostname, contextWithType->isSRPType };
+        InterfaceKey interfaceKey = { interfaceId, hostname, contextWithType->isSRP };
         sdCtx->OnNewAddress(interfaceKey, address);
 
         // Set the flag to start the timer for resolve on SRP domain to complete if the key has the SRP type requested flag set to
@@ -339,7 +339,7 @@ static void GetAddrInfo(ResolveContext * sdCtx)
         if (!interface.second.isDNSLookUpRequested)
         {
             ResolveContextWithType * contextWithType =
-                (interface.first.isSRPTypeRequested) ? &sdCtx->resolveContextWithSRPType : &sdCtx->resolveContextWithNonSRPType;
+                (interface.first.isSRPResult) ? &sdCtx->resolveContextWithSRPType : &sdCtx->resolveContextWithNonSRPType;
             auto err = DNSServiceGetAddrInfo(&sdRefCopy, kGetAddrInfoFlags, interfaceId, protocol, hostname, OnGetAddrInfo,
                                              contextWithType);
             VerifyOrReturn(kDNSServiceErr_NoError == err, sdCtx->Finalize(err));

src/platform/Darwin/DnssdImpl.h

@@ -240,16 +240,16 @@ struct InterfaceKey
 
     uint32_t interfaceId;
     std::string hostname;
-    bool isSRPTypeRequested = false;
+    bool isSRPResult = false;
 };
 
 struct ResolveContextWithType
 {
     ResolveContextWithType()  = default;
     ~ResolveContextWithType() = default;
 
-    ResolveContext * context;
-    bool isSRPType = false;
+    ResolveContext * const context;
+    const bool isSRPResolve;
 };
 
 struct ResolveContext : public GenericContext
@@ -263,7 +263,7 @@ struct ResolveContext : public GenericContext
 
     // Indicates whether the timer for 250 msecs should be started
     // to give the resolve on SRP domain some extra time to complete.
-    bool shoulStartSRPTimerForResolve = false;
+    bool shouldStartSRPTimerForResolve = false;
     bool isSRPTimerRunning            = false;
 
     ResolveContextWithType resolveContextWithSRPType;
@@ -284,7 +284,7 @@ struct ResolveContext : public GenericContext
     bool HasAddress();
 
     void OnNewInterface(uint32_t interfaceId, const char * fullname, const char * hostname, uint16_t port, uint16_t txtLen,
-                        const unsigned char * txtRecord, bool isSRPType);
+                        const unsigned char * txtRecord, bool isSRPResult);
     bool HasInterface();
     bool Matches(const char * otherInstanceName) const { return instanceName == otherInstanceName; }
 
@@ -294,7 +294,7 @@ struct ResolveContext : public GenericContext
      * Returns true if information was reported, false if not (e.g. if there
      * were no IP addresses, etc).
      */
-    bool TryReportingResultsForInterfaceIndex(uint32_t interfaceIndex, std::string hostname, bool isSRPType);
+    bool TryReportingResultsForInterfaceIndex(uint32_t interfaceIndex, const std::string & hostname, bool isSRPResult);
 
     bool TryReportingResultsForInterfaceIndex(uint32_t interfaceIndex);
 };