From a13812407b7aa8fe918d2de4a92cf4053cee6c1c Mon Sep 17 00:00:00 2001 From: Bartosz Polaczyk Date: Wed, 9 Nov 2016 10:55:14 +0100 Subject: [PATCH] Define NSError as nullable argument of completionHandler In order to expose it as Error? in Swift3 rather than Error --- SSZipArchive/SSZipArchive.h | 4 ++-- SSZipArchive/SSZipArchive.m | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SSZipArchive/SSZipArchive.h b/SSZipArchive/SSZipArchive.h index 3931bc4..9972ffd 100755 --- a/SSZipArchive/SSZipArchive.h +++ b/SSZipArchive/SSZipArchive.h @@ -39,14 +39,14 @@ NS_ASSUME_NONNULL_BEGIN + (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination progressHandler:(void (^)(NSString *entry, unz_file_info zipInfo, long entryNumber, long total))progressHandler - completionHandler:(void (^)(NSString *path, BOOL succeeded, NSError *error))completionHandler; + completionHandler:(void (^)(NSString *path, BOOL succeeded, NSError * __nullable error))completionHandler; + (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination overwrite:(BOOL)overwrite password:(nullable NSString *)password progressHandler:(void (^)(NSString *entry, unz_file_info zipInfo, long entryNumber, long total))progressHandler - completionHandler:(void (^)(NSString *path, BOOL succeeded, NSError *error))completionHandler; + completionHandler:(void (^)(NSString *path, BOOL succeeded, NSError * __nullable error))completionHandler; // Zip diff --git a/SSZipArchive/SSZipArchive.m b/SSZipArchive/SSZipArchive.m index 1b9d073..d608e18 100755 --- a/SSZipArchive/SSZipArchive.m +++ b/SSZipArchive/SSZipArchive.m @@ -86,7 +86,7 @@ overwrite:(BOOL)overwrite password:(NSString *)password progressHandler:(void (^)(NSString *entry, unz_file_info zipInfo, long entryNumber, long total))progressHandler - completionHandler:(void (^)(NSString *path, BOOL succeeded, NSError *error))completionHandler + completionHandler:(void (^)(NSString *path, BOOL succeeded, NSError *__nullable error))completionHandler { return [self unzipFileAtPath:path toDestination:destination preserveAttributes:YES overwrite:overwrite password:password error:nil delegate:nil progressHandler:progressHandler completionHandler:completionHandler]; } @@ -94,7 +94,7 @@ + (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination progressHandler:(void (^)(NSString *entry, unz_file_info zipInfo, long entryNumber, long total))progressHandler - completionHandler:(void (^)(NSString *path, BOOL succeeded, NSError *error))completionHandler + completionHandler:(void (^)(NSString *path, BOOL succeeded, NSError * __nullable error))completionHandler { return [self unzipFileAtPath:path toDestination:destination preserveAttributes:YES overwrite:YES password:nil error:nil delegate:nil progressHandler:progressHandler completionHandler:completionHandler]; } @@ -118,7 +118,7 @@ error:(NSError **)error delegate:(id)delegate progressHandler:(void (^)(NSString *entry, unz_file_info zipInfo, long entryNumber, long total))progressHandler - completionHandler:(void (^)(NSString *path, BOOL succeeded, NSError *error))completionHandler + completionHandler:(void (^)(NSString *path, BOOL succeeded, NSError * __nullable error))completionHandler { // Begin opening zipFile zip = unzOpen((const char*)[path UTF8String]);