Skip to content

Commit f3f0df5

Browse files
committed
chore(apple): fix build issues discovered internally
1 parent 92cf918 commit f3f0df5

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

packages/default-storage/ios/RNCAsyncStorage.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@
5050

5151
// Grab data from the cache. ResponseBlock result array will have an error at position 0, and an
5252
// array of arrays at position 1.
53-
- (void)multiGet:(NSArray<NSString *> *)keys callback:(RCTResponseSenderBlock)callback;
53+
- (void)multiGet:(NSArray<NSString *> *_Nullable)keys callback:(RCTResponseSenderBlock _Nullable )callback;
5454

5555
// Add multiple key value pairs to the cache.
56-
- (void)multiSet:(NSArray<NSArray<NSString *> *> *)kvPairs
57-
callback:(RCTResponseSenderBlock)callback;
56+
- (void)multiSet:(NSArray<NSArray<NSString *> *> *_Nullable)kvPairs
57+
callback:(RCTResponseSenderBlock _Nullable )callback;
5858

5959
// Interface for natively fetching all the keys from the storage data.
60-
- (void)getAllKeys:(RCTResponseSenderBlock)callback;
60+
- (void)getAllKeys:(RCTResponseSenderBlock _Nullable )callback;
6161

6262
@end

packages/default-storage/ios/RNCAsyncStorage.mm

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ static void RCTStorageDirectoryMigrate(NSString *oldDirectoryPath,
302302
// this folder and attempt folder copying again
303303
if (error != nil && error.code == 4 &&
304304
[newDirectoryPath isEqualToString:RCTGetStorageDirectory()]) {
305-
NSError *error = nil;
305+
error = nil;
306306
_createStorageDirectory(RCTCreateStorageDirectoryPath(@""), &error);
307307
if (error == nil) {
308308
RCTStorageDirectoryMigrate(
@@ -559,7 +559,7 @@ - (NSDictionary *)_ensureSetup
559559
return nil;
560560
}
561561

562-
- (NSDictionary *)_writeManifest:(NSMutableArray<NSDictionary *> **)errors
562+
- (NSDictionary *)_writeManifest:(NSMutableArray<NSDictionary *> *__autoreleasing *)errors
563563
{
564564
NSError *error;
565565
NSString *serialized = RCTJSONStringify(_manifest, &error);
@@ -587,7 +587,7 @@ - (NSDictionary *)_appendItemForKey:(NSString *)key
587587
return errorOut;
588588
}
589589

590-
- (NSString *)_getValueForKey:(NSString *)key errorOut:(NSDictionary **)errorOut
590+
- (NSString *)_getValueForKey:(NSString *)key errorOut:(NSDictionary *__autoreleasing *)errorOut
591591
{
592592
NSString *value =
593593
_manifest[key]; // nil means missing, null means there may be a data file, else: NSString
@@ -699,14 +699,14 @@ - (BOOL)_passthroughDelegate
699699
}
700700
}
701701

702-
NSDictionary *errorOut = [self _ensureSetup];
703-
if (errorOut) {
704-
callback(@[@[errorOut], (id)kCFNull]);
702+
NSDictionary *ensureSetupErrorOut = [self _ensureSetup];
703+
if (ensureSetupErrorOut) {
704+
callback(@[@[ensureSetupErrorOut], (id)kCFNull]);
705705
return;
706706
}
707707
[self _multiGet:keys
708708
callback:callback
709-
getter:^(NSUInteger i, NSString *key, NSDictionary **errorOut) {
709+
getter:^(__unused NSUInteger i, NSString *key, NSDictionary **errorOut) {
710710
return [self _getValueForKey:key errorOut:errorOut];
711711
}];
712712
}

0 commit comments

Comments
 (0)