Merge pull request #747 from macdoum1/master

minbi · web-flow · commit 97df0b4ca3ca · 2017-10-26T17:47:27.000-07:00
Fix Xcode 9 strict prototype warnings
diff --git a/AWSCognito/Internal/AWSCognitoSQLiteManager.m b/AWSCognito/Internal/AWSCognitoSQLiteManager.m
@@ -445,7 +445,7 @@ - (BOOL)putDatasetMetadata:(NSArray *)datasets error:(NSError **)error {
 
 - (AWSCognitoRecord *)getRecordById_internal:(NSString *)recordId datasetName:(NSString *)datasetName error:(NSError * __autoreleasing *)error sync:(BOOL) sync{
     __block AWSCognitoRecord *record = nil;
-    void (^getRecord)() = ^{
+    void (^getRecord)(void) = ^{
         NSString *query = [NSString stringWithFormat:@"SELECT %@, %@, %@, %@, %@, %@ FROM %@ WHERE %@ = ? AND %@ = ? AND %@ = ?",
                            AWSCognitoLastModifiedFieldName,
                            AWSCognitoModifiedByFieldName,
diff --git a/AWSCognitoIdentityProvider/AWSCognitoIdentityUser.m b/AWSCognitoIdentityProvider/AWSCognitoIdentityUser.m
@@ -700,7 +700,7 @@ - (BOOL) isFirstCustomStepSRP: (AWSCognitoIdentityCustomChallengeDetails *) cust
 
 
 //Determine whether the error (if any) on the initiateAuth is a device not found error and if so forget the device and retry
-- (AWSTask<AWSCognitoIdentityProviderInitiateAuthResponse*>*) forgetDeviceOnInitiateDeviceNotFoundError:(AWSTask<AWSCognitoIdentityProviderInitiateAuthResponse*> * _Nonnull) task retryContinuation: (AWSTask<AWSCognitoIdentityProviderInitiateAuthResponse*>* (^_Nonnull)()) retryContinuation {
+- (AWSTask<AWSCognitoIdentityProviderInitiateAuthResponse*>*) forgetDeviceOnInitiateDeviceNotFoundError:(AWSTask<AWSCognitoIdentityProviderInitiateAuthResponse*> * _Nonnull) task retryContinuation: (AWSTask<AWSCognitoIdentityProviderInitiateAuthResponse*>* (^_Nonnull)(void)) retryContinuation {
     if([self isDeviceNotFoundError:task.error]){
         [self forgetDeviceInternal];
         return retryContinuation();
@@ -709,7 +709,7 @@ - (BOOL) isFirstCustomStepSRP: (AWSCognitoIdentityCustomChallengeDetails *) cust
 }
 
 //Determine whether the error (if any) on the respondToAuthChallenge is a device not found error and if so forget the device and retry
-- (AWSTask<AWSCognitoIdentityProviderRespondToAuthChallengeResponse*>*) forgetDeviceOnRespondDeviceNotFoundError:(AWSTask<AWSCognitoIdentityProviderRespondToAuthChallengeResponse*> * _Nonnull) task retryContinuation: (AWSTask<AWSCognitoIdentityProviderRespondToAuthChallengeResponse*>* (^_Nonnull)()) retryContinuation {
+- (AWSTask<AWSCognitoIdentityProviderRespondToAuthChallengeResponse*>*) forgetDeviceOnRespondDeviceNotFoundError:(AWSTask<AWSCognitoIdentityProviderRespondToAuthChallengeResponse*> * _Nonnull) task retryContinuation: (AWSTask<AWSCognitoIdentityProviderRespondToAuthChallengeResponse*>* (^_Nonnull)(void)) retryContinuation {
     if([self isDeviceNotFoundError:task.error]){
         [self forgetDeviceInternal];
         return retryContinuation();
diff --git a/AWSCognitoIdentityProvider/Internal/NSData+AWSCognitoIdentityProvider.h b/AWSCognitoIdentityProvider/Internal/NSData+AWSCognitoIdentityProvider.h
@@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (NSData*) aws_dataWithSignedBigInteger:(AWSJKBigInteger *)bigInteger;
 + (NSData*) aws_dataFromHexString:(NSString*)hexString;
 - (AWSJKBigInteger *)aws_toBigInt;
-void awsbigint_loadBigInt();
+void awsbigint_loadBigInt(void);
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/AWSCore/Bolts/AWSCancellationToken.h b/AWSCore/Bolts/AWSCancellationToken.h
@@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 /*!
  A block that will be called when a token is cancelled.
  */
-typedef void(^AWSCancellationBlock)();
+typedef void(^AWSCancellationBlock)(void);
 
 /*!
  The consumer view of a CancellationToken.
diff --git a/AWSCore/Bolts/AWSExecutor.h b/AWSCore/Bolts/AWSExecutor.h
@@ -37,7 +37,7 @@ NS_ASSUME_NONNULL_BEGIN
  Returns a new executor that uses the given block to execute continuations.
  @param block The block to use.
  */
-+ (instancetype)executorWithBlock:(void(^)(void(^block)()))block;
++ (instancetype)executorWithBlock:(void(^)(void(^block)(void)))block;
 
 /*!
  Returns a new executor that runs continuations on the given queue.
@@ -55,7 +55,7 @@ NS_ASSUME_NONNULL_BEGIN
  Runs the given block using this executor's particular strategy.
  @param block The block to execute.
  */
-- (void)execute:(void(^)())block;
+- (void)execute:(void(^)(void))block;
 
 @end
 
diff --git a/AWSCore/Bolts/AWSExecutor.m b/AWSCore/Bolts/AWSExecutor.m
@@ -39,7 +39,7 @@
 
 @interface AWSExecutor ()
 
-@property (nonatomic, copy) void(^block)(void(^block)());
+@property (nonatomic, copy) void(^block)(void(^block)(void));
 
 @end
 
@@ -51,7 +51,7 @@ + (instancetype)defaultExecutor {
     static AWSExecutor *defaultExecutor = NULL;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        defaultExecutor = [self executorWithBlock:^void(void(^block)()) {
+        defaultExecutor = [self executorWithBlock:^void(void(^block)(void)) {
             // We prefer to run everything possible immediately, so that there is callstack information
             // when debugging. However, we don't want the stack to get too deep, so if the remaining stack space
             // is less than 10% of the total space, we dispatch to another GCD queue.
@@ -74,7 +74,7 @@ + (instancetype)immediateExecutor {
     static AWSExecutor *immediateExecutor = NULL;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        immediateExecutor = [self executorWithBlock:^void(void(^block)()) {
+        immediateExecutor = [self executorWithBlock:^void(void(^block)(void)) {
             block();
         }];
     });
@@ -85,7 +85,7 @@ + (instancetype)mainThreadExecutor {
     static AWSExecutor *mainThreadExecutor = NULL;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        mainThreadExecutor = [self executorWithBlock:^void(void(^block)()) {
+        mainThreadExecutor = [self executorWithBlock:^void(void(^block)(void)) {
             if (![NSThread isMainThread]) {
                 dispatch_async(dispatch_get_main_queue(), block);
             } else {
@@ -98,25 +98,25 @@ + (instancetype)mainThreadExecutor {
     return mainThreadExecutor;
 }
 
-+ (instancetype)executorWithBlock:(void(^)(void(^block)()))block {
++ (instancetype)executorWithBlock:(void(^)(void(^block)(void)))block {
     return [[self alloc] initWithBlock:block];
 }
 
 + (instancetype)executorWithDispatchQueue:(dispatch_queue_t)queue {
-    return [self executorWithBlock:^void(void(^block)()) {
+    return [self executorWithBlock:^void(void(^block)(void)) {
         dispatch_async(queue, block);
     }];
 }
 
 + (instancetype)executorWithOperationQueue:(NSOperationQueue *)queue {
-    return [self executorWithBlock:^void(void(^block)()) {
+    return [self executorWithBlock:^void(void(^block)(void)) {
         [queue addOperation:[NSBlockOperation blockOperationWithBlock:block]];
     }];
 }
 
 #pragma mark - Initializer
 
-- (instancetype)initWithBlock:(void(^)(void(^block)()))block {
+- (instancetype)initWithBlock:(void(^)(void(^block)(void)))block {
     self = [super init];
     if (!self) return self;
 
@@ -127,7 +127,7 @@ - (instancetype)initWithBlock:(void(^)(void(^block)()))block {
 
 #pragma mark - Execution
 
-- (void)execute:(void(^)())block {
+- (void)execute:(void(^)(void))block {
     self.block(block);
 }
 
diff --git a/AWSCore/Bolts/AWSTask.h b/AWSCore/Bolts/AWSTask.h
@@ -111,7 +111,7 @@ typedef __nullable id(^AWSContinuationBlock)(AWSTask<ResultType> *t);
  If block returns a AWSTask, then the task returned from
  this method will not be completed until that task is completed.
  */
-+ (instancetype)taskFromExecutor:(AWSExecutor *)executor withBlock:(nullable id (^)())block;
++ (instancetype)taskFromExecutor:(AWSExecutor *)executor withBlock:(nullable id (^)(void))block;
 
 // Properties that will be set on the task once it is completed.
 
diff --git a/AWSCore/Bolts/AWSTask.m b/AWSCore/Bolts/AWSTask.m
@@ -223,7 +223,7 @@ + (instancetype)taskForCompletionOfAnyTask:(nullable NSArray<AWSTask *> *)tasks
     return tcs.task;
 }
 
-+ (instancetype)taskFromExecutor:(AWSExecutor *)executor withBlock:(nullable id (^)())block {
++ (instancetype)taskFromExecutor:(AWSExecutor *)executor withBlock:(nullable id (^)(void))block {
     return [[self taskWithResult:nil] continueWithExecutor:executor withBlock:^id(AWSTask *task) {
         return block();
     }];
@@ -303,7 +303,7 @@ - (void)runContinuations {
         [self.condition lock];
         [self.condition broadcast];
         [self.condition unlock];
-        for (void (^callback)() in self.callbacks) {
+        for (void (^callback)(void) in self.callbacks) {
             callback();
         }
         [self.callbacks removeAllObjects];
diff --git a/AWSCore/GZIP/AWSGZIP.h b/AWSCore/GZIP/AWSGZIP.h
@@ -33,7 +33,7 @@
 
 #import <Foundation/Foundation.h>
 
-void awsgzip_loadGZIP();
+void awsgzip_loadGZIP(void);
 
 @interface NSData (AWSGZIP)
 
diff --git a/AWSCore/Logging/AWSDDFileLogger.h b/AWSCore/Logging/AWSDDFileLogger.h
@@ -397,7 +397,7 @@ extern unsigned long long const kAWSDDDefaultLogFilesDiskQuota;
  *  You can optionally force the current log file to be rolled with this method.
  *  CompletionBlock will be called on main queue.
  */
-- (void)rollLogFileWithCompletionBlock:(void (^)())completionBlock NS_SWIFT_NAME(rollLogFile(withCompletion:));
+- (void)rollLogFileWithCompletionBlock:(void (^)(void))completionBlock NS_SWIFT_NAME(rollLogFile(withCompletion:));
 
 /**
  *  Method is deprecated.
diff --git a/AWSCore/Logging/AWSDDFileLogger.m b/AWSCore/Logging/AWSDDFileLogger.m
@@ -779,7 +779,7 @@ - (void)rollLogFile {
     [self rollLogFileWithCompletionBlock:nil];
 }
 
-- (void)rollLogFileWithCompletionBlock:(void (^)())completionBlock {
+- (void)rollLogFileWithCompletionBlock:(void (^)(void))completionBlock {
     // This method is public.
     // We need to execute the rolling on our logging thread/queue.
 
diff --git a/AWSCore/Mantle/AWSMTLModel+NSCoding.h b/AWSCore/Mantle/AWSMTLModel+NSCoding.h
@@ -8,7 +8,7 @@
 
 #import "AWSMTLModel.h"
 
-void awsmtl_loadMTLNSCoding();
+void awsmtl_loadMTLNSCoding(void);
 
 // Defines how a MTLModel property key should be encoded into an archive.
 //
diff --git a/AWSCore/Mantle/NSValueTransformer+AWSMTLPredefinedTransformerAdditions.h b/AWSCore/Mantle/NSValueTransformer+AWSMTLPredefinedTransformerAdditions.h
@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 
-void awsmtl_loadMTLPredefinedTransformerAdditions();
+void awsmtl_loadMTLPredefinedTransformerAdditions(void);
 
 // The name for a value transformer that converts strings into URLs and back.
 extern NSString * const AWSMTLURLValueTransformerName;
diff --git a/AWSCore/Mantle/extobjc/AWSEXTScope.h b/AWSCore/Mantle/extobjc/AWSEXTScope.h
@@ -88,7 +88,7 @@
     _Pragma("clang diagnostic pop")
 
 /*** implementation details follow ***/
-typedef void (^awsmtl_cleanupBlock_t)();
+typedef void (^awsmtl_cleanupBlock_t)(void);
 
 void awsmtl_executeCleanupBlock (__strong awsmtl_cleanupBlock_t *block);
 
diff --git a/AWSLex/AWSLexInteractionKit.h b/AWSLex/AWSLexInteractionKit.h
@@ -547,12 +547,12 @@ typedef NS_ENUM(NSInteger, AWSLexSpeechEncoding) {
 /**
  Set it to handle successful audio play.
  */
-@property (nonatomic) void (^completionBlock)();
+@property (nonatomic) void (^completionBlock)(void);
 
 /**
  Set it to handle when audio has been prepared to play.
  */
-@property (nonatomic) void (^preparedBlock)();
+@property (nonatomic) void (^preparedBlock)(void);
 
 - (instancetype)initWithData:(NSData *)audioData;
 
diff --git a/AWSLex/AWSLexInteractionKit.m b/AWSLex/AWSLexInteractionKit.m
@@ -857,11 +857,11 @@ - (void)startConversation:(AWSLexPostContentRequest *)request{
     }];
 }
 
-- (void)dispatchBlockOnMainQueue:(void (^)())block{
+- (void)dispatchBlockOnMainQueue:(void (^)(void))block{
     dispatch_async(dispatch_get_main_queue(), block);
 }
 
-- (void)dispatchBlockOnInteractionDelegateQueue:(void (^)())block{
+- (void)dispatchBlockOnInteractionDelegateQueue:(void (^)(void))block{
     dispatch_async(interactionDelegateQueue, block);
 }
 
diff --git a/AWSS3/AWSS3TransferUtility.h b/AWSS3/AWSS3TransferUtility.h
@@ -265,7 +265,7 @@ typedef void (^AWSS3TransferUtilityProgressBlock) (AWSS3TransferUtilityTask *tas
  */
 + (void)interceptApplication:(UIApplication *)application
 handleEventsForBackgroundURLSession:(NSString *)identifier
-           completionHandler:(void (^)())completionHandler;
+           completionHandler:(void (^)(void))completionHandler;
 
 
 /**
diff --git a/AWSS3/AWSS3TransferUtility.m b/AWSS3/AWSS3TransferUtility.m
@@ -38,7 +38,7 @@ @interface AWSS3TransferUtility() <NSURLSessionDelegate, NSURLSessionTaskDelegat
 @property (strong, nonatomic) NSString *sessionIdentifier;
 @property (strong, nonatomic) NSString *temporaryDirectoryPath;
 @property (strong, nonatomic) AWSSynchronizedMutableDictionary *taskDictionary;
-@property (copy, nonatomic) void (^backgroundURLSessionCompletionHandler)();
+@property (copy, nonatomic) void (^backgroundURLSessionCompletionHandler)(void);
 
 @end
 
@@ -721,7 +721,7 @@ - (AWSS3TransferUtilityDownloadTask *)getDownloadTask:(NSURLSessionDownloadTask
 
 + (void)interceptApplication:(UIApplication *)application
 handleEventsForBackgroundURLSession:(NSString *)identifier
-           completionHandler:(void (^)())completionHandler {
+           completionHandler:(void (^)(void))completionHandler {
     // For the default service client
     if ([identifier isEqualToString:_defaultS3TransferUtility.sessionIdentifier]) {
         _defaultS3TransferUtility.backgroundURLSessionCompletionHandler = completionHandler;
diff --git a/AWSiOSSDKv2.xcodeproj/project.pbxproj b/AWSiOSSDKv2.xcodeproj/project.pbxproj
@@ -11525,7 +11525,7 @@
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = NO;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -11585,7 +11585,7 @@
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = NO;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
