From ab7cbf3cd9563d0af49556442ba3850cac0df708 Mon Sep 17 00:00:00 2001 From: "logan.gauthier@metova.com" Date: Wed, 16 Sep 2015 21:38:02 -0500 Subject: [PATCH] Fixes issue #112 involving Swift 2.0 error handling compatibility. --- SSKeychain/SSKeychain.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/SSKeychain/SSKeychain.h b/SSKeychain/SSKeychain.h index 00f727e..ae2d6d8 100644 --- a/SSKeychain/SSKeychain.h +++ b/SSKeychain/SSKeychain.h @@ -72,7 +72,7 @@ extern NSString *const kSSKeychainWhereKey; have a password for the given parameters. */ + (NSString *)passwordForService:(NSString *)serviceName account:(NSString *)account; -+ (NSString *)passwordForService:(NSString *)serviceName account:(NSString *)account error:(NSError **)error; ++ (NSString *)passwordForService:(NSString *)serviceName account:(NSString *)account error:(NSError **)error __attribute__((swift_error(none))); /** Returns a nsdata containing the password for a given account and service, or `nil` if the Keychain doesn't have a @@ -86,7 +86,7 @@ extern NSString *const kSSKeychainWhereKey; have a password for the given parameters. */ + (NSData *)passwordDataForService:(NSString *)serviceName account:(NSString *)account; -+ (NSData *)passwordDataForService:(NSString *)serviceName account:(NSString *)account error:(NSError **)error; ++ (NSData *)passwordDataForService:(NSString *)serviceName account:(NSString *)account error:(NSError **)error __attribute__((swift_error(none))); /** @@ -99,7 +99,7 @@ extern NSString *const kSSKeychainWhereKey; @return Returns `YES` on success, or `NO` on failure. */ + (BOOL)deletePasswordForService:(NSString *)serviceName account:(NSString *)account; -+ (BOOL)deletePasswordForService:(NSString *)serviceName account:(NSString *)account error:(NSError **)error; ++ (BOOL)deletePasswordForService:(NSString *)serviceName account:(NSString *)account error:(NSError **)error __attribute__((swift_error(none))); /** @@ -114,7 +114,7 @@ extern NSString *const kSSKeychainWhereKey; @return Returns `YES` on success, or `NO` on failure. */ + (BOOL)setPassword:(NSString *)password forService:(NSString *)serviceName account:(NSString *)account; -+ (BOOL)setPassword:(NSString *)password forService:(NSString *)serviceName account:(NSString *)account error:(NSError **)error; ++ (BOOL)setPassword:(NSString *)password forService:(NSString *)serviceName account:(NSString *)account error:(NSError **)error __attribute__((swift_error(none))); /** Sets a password in the Keychain. @@ -128,7 +128,7 @@ extern NSString *const kSSKeychainWhereKey; @return Returns `YES` on success, or `NO` on failure. */ + (BOOL)setPasswordData:(NSData *)password forService:(NSString *)serviceName account:(NSString *)account; -+ (BOOL)setPasswordData:(NSData *)password forService:(NSString *)serviceName account:(NSString *)account error:(NSError **)error; ++ (BOOL)setPasswordData:(NSData *)password forService:(NSString *)serviceName account:(NSString *)account error:(NSError **)error __attribute__((swift_error(none))); /** Returns an array containing the Keychain's accounts, or `nil` if the Keychain has no accounts. @@ -140,7 +140,7 @@ extern NSString *const kSSKeychainWhereKey; accounts. The order of the objects in the array isn't defined. */ + (NSArray *)allAccounts; -+ (NSArray *)allAccounts:(NSError *__autoreleasing *)error; ++ (NSArray *)allAccounts:(NSError *__autoreleasing *)error __attribute__((swift_error(none))); /** @@ -156,7 +156,7 @@ extern NSString *const kSSKeychainWhereKey; doesn't have any accounts for the given `serviceName`. The order of the objects in the array isn't defined. */ + (NSArray *)accountsForService:(NSString *)serviceName; -+ (NSArray *)accountsForService:(NSString *)serviceName error:(NSError *__autoreleasing *)error; ++ (NSArray *)accountsForService:(NSString *)serviceName error:(NSError *__autoreleasing *)error __attribute__((swift_error(none))); #pragma mark - Configuration