kylefang/UICKeyChainStore
1
0
Fork 0
mirror of https://github.com/zhigang1992/UICKeyChainStore.git synced 2026-01-12 22:53:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix static analyzer warning Method accepting NSError** should have a non-void return value to indicate whether or not an error occurred

Browse Source
This commit is contained in:
kishikawa katsumi
2014-12-18 17:53:49 +09:00
parent 21d23891ff
commit 4f8bc0612a
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/UICKeyChainStore.h
View File

@@ -57,12 +57,12 @@ typedef NS_ENUM(NSInteger, UICKeyChainStoreErrorCode) {
+ (BOOL)setData:(NSData *)data forKey:(NSString *)key service:(NSString *)service accessGroup:(NSString *)accessGroup error:(NSError * __autoreleasing *)error;
- (void)setString:(NSString *)string forKey:(NSString *)key;
- (void)setString:(NSString *)string forKey:(NSString *)key error:(NSError * __autoreleasing *)error;
- (BOOL)setString:(NSString *)string forKey:(NSString *)key error:(NSError * __autoreleasing *)error;
- (NSString *)stringForKey:(NSString *)key;
- (NSString *)stringForKey:(NSString *)key error:(NSError * __autoreleasing *)error;
- (void)setData:(NSData *)data forKey:(NSString *)key;
- (void)setData:(NSData *)data forKey:(NSString *)key error:(NSError * __autoreleasing *)error;
- (BOOL)setData:(NSData *)data forKey:(NSString *)key error:(NSError * __autoreleasing *)error;
- (NSData *)dataForKey:(NSString *)key;
- (NSData *)dataForKey:(NSString *)key error:(NSError * __autoreleasing *)error;
@@ -80,12 +80,12 @@ typedef NS_ENUM(NSInteger, UICKeyChainStoreErrorCode) {
+ (BOOL)removeAllItemsForService:(NSString *)service accessGroup:(NSString *)accessGroup error:(NSError * __autoreleasing *)error;
- (void)removeItemForKey:(NSString *)key;
- (void)removeItemForKey:(NSString *)key error:(NSError * __autoreleasing *)error;
- (BOOL)removeItemForKey:(NSString *)key error:(NSError * __autoreleasing *)error;
- (void)removeAllItems;
- (void)removeAllItemsWithError:(NSError * __autoreleasing *)error;
- (BOOL)removeAllItemsWithError:(NSError * __autoreleasing *)error;
- (void)synchronize;
- (void)synchronizeWithError:(NSError *__autoreleasing *)error;
- (BOOL)synchronizeWithError:(NSError *__autoreleasing *)error;
// object subscripting

18
Lib/UICKeyChainStore.m
View File

@@ -322,9 +322,10 @@ static NSString *_defaultService;
[self setData:[string dataUsingEncoding:NSUTF8StringEncoding] forKey:key error:nil];
}
- (void)setString:(NSString *)string forKey:(NSString *)key error:(NSError *__autoreleasing *)error
- (BOOL)setString:(NSString *)string forKey:(NSString *)key error:(NSError *__autoreleasing *)error
{
[self setData:[string dataUsingEncoding:NSUTF8StringEncoding] forKey:key error:error];
return error == nil;
}
- (NSString *)stringForKey:(id)key
@@ -349,19 +350,20 @@ static NSString *_defaultService;
[self setData:data forKey:key error:nil];
}
- (void)setData:(NSData *)data forKey:(NSString *)key error:(NSError *__autoreleasing *)error
- (BOOL)setData:(NSData *)data forKey:(NSString *)key error:(NSError *__autoreleasing *)error
{
if (!key) {
if (error) {
*error = [NSError errorWithDomain:UICKeyChainStoreErrorDomain code:UICKeyChainStoreErrorInvalidArguments userInfo:@{NSLocalizedDescriptionKey: NSLocalizedString(@"`key` must not to be nil", nil)}];
}
return;
return error == nil;
}
if (!data) {
[self removeItemForKey:key error:error];
} else {
[itemsToUpdate setObject:data forKey:key];
}
return error == nil;
}
- (NSData *)dataForKey:(NSString *)key
@@ -522,13 +524,14 @@ static NSString *_defaultService;
}
}
- (void)removeItemForKey:(NSString *)key error:(NSError *__autoreleasing *)error
- (BOOL)removeItemForKey:(NSString *)key error:(NSError *__autoreleasing *)error
{
if ([itemsToUpdate objectForKey:key]) {
[itemsToUpdate removeObjectForKey:key];
} else {
[self.class removeItemForKey:key service:self.service accessGroup:self.accessGroup error:error];
}
return error == nil;
}
- (void)removeAllItems
@@ -536,10 +539,10 @@ static NSString *_defaultService;
[self removeAllItemsWithError:nil];
}
- (void)removeAllItemsWithError:(NSError *__autoreleasing *)error
- (BOOL)removeAllItemsWithError:(NSError *__autoreleasing *)error
{
[itemsToUpdate removeAllObjects];
[self.class removeAllItemsForService:self.service accessGroup:self.accessGroup error:error];
return [self.class removeAllItemsForService:self.service accessGroup:self.accessGroup error:error];
}
#pragma mark -
@@ -553,13 +556,14 @@ static NSString *_defaultService;
[itemsToUpdate removeAllObjects];
}
- (void)synchronizeWithError:(NSError *__autoreleasing *)error
- (BOOL)synchronizeWithError:(NSError *__autoreleasing *)error
{
for (NSString *key in itemsToUpdate) {
[self.class setData:[itemsToUpdate objectForKey:key] forKey:key service:self.service accessGroup:self.accessGroup error:error];
}
[itemsToUpdate removeAllObjects];
return error == nil;
}
#pragma mark -