Minor fixes to CHIP API definitions (project-chip#6897)

* Minor fixes to CHIP API definitions * Restyled by clang-format Co-authored-by: Restyled.io <[email protected]>
nivi-apple · May 18, 2021 · 791f18f · 791f18f
1 parent 4fd0192
commit 791f18f
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/src/darwin/Framework/CHIP/CHIPDevice.h b/src/darwin/Framework/CHIP/CHIPDevice.h
@@ -25,10 +25,10 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CHIPDevice : NSObject
 
 - (BOOL)openPairingWindow:(NSUInteger)duration error:(NSError * __autoreleasing *)error;
-- (NSString *)openPairingWindowWithPIN:(NSUInteger)duration
-                         discriminator:(NSUInteger)discriminator
-                              setupPIN:(NSUInteger)setupPIN
-                                 error:(NSError * __autoreleasing *)error;
+- (nullable NSString *)openPairingWindowWithPIN:(NSUInteger)duration
+                                  discriminator:(NSUInteger)discriminator
+                                       setupPIN:(NSUInteger)setupPIN
+                                          error:(NSError * __autoreleasing *)error;
 - (BOOL)isActive;
 
 - (instancetype)init NS_UNAVAILABLE;

diff --git a/src/darwin/Framework/CHIP/CHIPDeviceController.h b/src/darwin/Framework/CHIP/CHIPDeviceController.h
@@ -90,7 +90,7 @@ NS_ASSUME_NONNULL_BEGIN
  *
  * @param[in] storageDelegate The delegate for persistent storage
  */
-- (BOOL)startup:(_Nullable id<CHIPPersistentStorageDelegate>)storageDelegate;
+- (BOOL)startup:(nullable id<CHIPPersistentStorageDelegate>)storageDelegate;
 
 /**
  * Shutdown the CHIP Stack. Repeated calls to shutdown without calls to startup in between are NO-OPs.

diff --git a/src/darwin/Framework/CHIP/CHIPDevicePairingDelegate.h b/src/darwin/Framework/CHIP/CHIPDevicePairingDelegate.h
@@ -42,19 +42,19 @@ typedef NS_ENUM(NSUInteger, CHIPPairingStatus) {
  * Notify the delegate when pairing is completed
  *
  */
-- (void)onPairingComplete:(NSError *)error;
+- (void)onPairingComplete:(nullable NSError *)error;
 
 /**
  * Notify the delegate when pairing is deleted
  *
  */
-- (void)onPairingDeleted:(NSError *)error;
+- (void)onPairingDeleted:(nullable NSError *)error;
 
 /**
  * Notify the delegate when address is updated
  *
  */
-- (void)onAddressUpdated:(NSError *)error;
+- (void)onAddressUpdated:(nullable NSError *)error;
 
 @end
 

diff --git a/src/darwin/Framework/CHIP/CHIPManualSetupPayloadParser.h b/src/darwin/Framework/CHIP/CHIPManualSetupPayloadParser.h
@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface CHIPManualSetupPayloadParser : NSObject
 - (instancetype)initWithDecimalStringRepresentation:(NSString *)decimalStringRepresentation;
-- (CHIPSetupPayload * __nullable)populatePayload:(NSError * __autoreleasing *)error;
+- (nullable CHIPSetupPayload *)populatePayload:(NSError * __autoreleasing *)error;
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/src/darwin/Framework/CHIP/CHIPPersistentStorageDelegate.h b/src/darwin/Framework/CHIP/CHIPPersistentStorageDelegate.h
@@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
  * Get the value for the given key
  *
  */
-- (NSString *)CHIPGetKeyValue:(NSString *)key;
+- (nullable NSString *)CHIPGetKeyValue:(NSString *)key;
 
 /**
  * Set the value of the key to the given value

diff --git a/src/darwin/Framework/CHIP/CHIPQRCodeSetupPayloadParser.h b/src/darwin/Framework/CHIP/CHIPQRCodeSetupPayloadParser.h
@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface CHIPQRCodeSetupPayloadParser : NSObject
 - (instancetype)initWithBase38Representation:(NSString *)base38Representation;
-- (CHIPSetupPayload * __nullable)populatePayload:(NSError * __autoreleasing *)error;
+- (nullable CHIPSetupPayload *)populatePayload:(NSError * __autoreleasing *)error;
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/src/darwin/Framework/CHIP/CHIPSetupPayload.h b/src/darwin/Framework/CHIP/CHIPSetupPayload.h
@@ -52,7 +52,7 @@ typedef NS_ENUM(NSUInteger, CHIPOptionalQRCodeInfoType) {
 @property (nonatomic, strong) NSNumber * setUpPINCode;
 
 @property (nonatomic, strong) NSString * serialNumber;
-- (NSArray<CHIPOptionalQRCodeInfo *> *)getAllOptionalVendorData:(NSError * __autoreleasing *)error;
+- (nullable NSArray<CHIPOptionalQRCodeInfo *> *)getAllOptionalVendorData:(NSError * __autoreleasing *)error;
 
 @end