Address more review comments.

project-chip · Aug 2, 2023 · 58af776 · 58af776
1 parent 6a5fe7b
commit 58af776
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/darwin/Framework/CHIP/MTRConversion.h b/src/darwin/Framework/CHIP/MTRConversion.h
@@ -43,7 +43,7 @@ inline NSDate * ChipEpochSecondsAsDate(uint32_t chipEpochSeconds)
 /**
  * Utilities for converting between NSSet<NSNumber *> and chip::CATValues.
  */
-CHIP_ERROR ToCATValues(NSSet<NSNumber *> * catSet, chip::CATValues & values);
-NSSet<NSNumber *> * FromCATValues(const chip::CATValues & values);
+CHIP_ERROR SetToCATValues(NSSet<NSNumber *> * catSet, chip::CATValues & values);
+NSSet<NSNumber *> * CATValuesToSet(const chip::CATValues & values);
 
 NS_ASSUME_NONNULL_END
diff --git a/src/darwin/Framework/CHIP/MTRConversion.mm b/src/darwin/Framework/CHIP/MTRConversion.mm
@@ -19,7 +19,7 @@
 
 #include <lib/support/SafeInt.h>
 
-CHIP_ERROR ToCATValues(NSSet<NSNumber *> * catSet, chip::CATValues & values)
+CHIP_ERROR SetToCATValues(NSSet<NSNumber *> * catSet, chip::CATValues & values)
 {
     values = chip::kUndefinedCATs;
 
@@ -49,7 +49,7 @@ CHIP_ERROR ToCATValues(NSSet<NSNumber *> * catSet, chip::CATValues & values)
     return CHIP_NO_ERROR;
 }
 
-NSSet<NSNumber *> * FromCATValues(const chip::CATValues & values)
+NSSet<NSNumber *> * CATValuesToSet(const chip::CATValues & values)
 {
     auto * catSet = [[NSMutableSet alloc] initWithCapacity:values.GetNumTagsPresent()];
     for (auto & value : values.values) {

diff --git a/src/darwin/Framework/CHIP/MTRDeviceController.mm b/src/darwin/Framework/CHIP/MTRDeviceController.mm
@@ -313,9 +313,9 @@ - (BOOL)startup:(MTRDeviceControllerStartupParamsInternal *)startupParams
 
             chip::CATValues cats = chip::kUndefinedCATs;
             if (startupParams.caseAuthenticatedTags != nil) {
-                errorCode = ToCATValues(startupParams.caseAuthenticatedTags, cats);
+                errorCode = SetToCATValues(startupParams.caseAuthenticatedTags, cats);
                 if (errorCode != CHIP_NO_ERROR) {
-                    // ToCATValues already handles logging.
+                    // SetToCATValues already handles logging.
                     return;
                 }
             }

diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams.mm b/src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams.mm
@@ -303,7 +303,7 @@ - (instancetype)initForExistingFabric:(FabricTable *)fabricTable
 
         auto tagCount = cats.GetNumTagsPresent();
         if (tagCount > 0) {
-            self.caseAuthenticatedTags = FromCATValues(cats);
+            self.caseAuthenticatedTags = CATValuesToSet(cats);
         } else {
             self.caseAuthenticatedTags = nil;
         }

diff --git a/src/darwin/Framework/CHIP/MTROperationalCredentialsDelegate.mm b/src/darwin/Framework/CHIP/MTROperationalCredentialsDelegate.mm
@@ -470,7 +470,7 @@ uint64_t GetIssuerId(NSNumber * _Nullable providedIssuerId)
 
     CATValues cats;
     if (caseAuthenticatedTags != nil) {
-        ReturnErrorOnFailure(ToCATValues(caseAuthenticatedTags, cats));
+        ReturnErrorOnFailure(SetToCATValues(caseAuthenticatedTags, cats));
     }
 
     uint8_t nocBuffer[Controller::kMaxCHIPDERCertLength];