From 72a85e1ee69f1c19c7b81d3db35edea8dbed6334 Mon Sep 17 00:00:00 2001 From: Mattt Thompson Date: Wed, 22 Aug 2012 11:32:59 -0700 Subject: [PATCH] Renaming numberOfCompletedOperations variable in progress block to numberOfFinishedOperations --- AFNetworking/AFHTTPClient.h | 4 ++-- AFNetworking/AFHTTPClient.m | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/AFNetworking/AFHTTPClient.h b/AFNetworking/AFHTTPClient.h index c70df00..879f727 100644 --- a/AFNetworking/AFHTTPClient.h +++ b/AFNetworking/AFHTTPClient.h @@ -362,7 +362,7 @@ extern NSString * AFQueryStringFromParametersWithEncoding(NSDictionary *paramete @discussion Operations are created by passing the specified `NSURLRequest` objects in `requests`, using `-HTTPRequestOperationWithRequest:success:failure:`, with `nil` for both the `success` and `failure` parameters. */ - (void)enqueueBatchOfHTTPRequestOperationsWithRequests:(NSArray *)requests - progressBlock:(void (^)(NSUInteger numberOfCompletedOperations, NSUInteger totalNumberOfOperations))progressBlock + progressBlock:(void (^)(NSUInteger numberOfFinishedOperations, NSUInteger totalNumberOfOperations))progressBlock completionBlock:(void (^)(NSArray *operations))completionBlock; /** @@ -373,7 +373,7 @@ extern NSString * AFQueryStringFromParametersWithEncoding(NSDictionary *paramete @param completionBlock A block object to be executed upon the completion of all of the request operations in the batch. This block has no return value and takes a single argument: the batched request operations. */ - (void)enqueueBatchOfHTTPRequestOperations:(NSArray *)operations - progressBlock:(void (^)(NSUInteger numberOfCompletedOperations, NSUInteger totalNumberOfOperations))progressBlock + progressBlock:(void (^)(NSUInteger numberOfFinishedOperations, NSUInteger totalNumberOfOperations))progressBlock completionBlock:(void (^)(NSArray *operations))completionBlock; ///--------------------------- diff --git a/AFNetworking/AFHTTPClient.m b/AFNetworking/AFHTTPClient.m index 53d598a..53d90ef 100644 --- a/AFNetworking/AFHTTPClient.m +++ b/AFNetworking/AFHTTPClient.m @@ -559,7 +559,7 @@ static void AFNetworkReachabilityReleaseCallback(const void *info) { } - (void)enqueueBatchOfHTTPRequestOperationsWithRequests:(NSArray *)requests - progressBlock:(void (^)(NSUInteger numberOfCompletedOperations, NSUInteger totalNumberOfOperations))progressBlock + progressBlock:(void (^)(NSUInteger numberOfFinishedOperations, NSUInteger totalNumberOfOperations))progressBlock completionBlock:(void (^)(NSArray *operations))completionBlock { NSMutableArray *mutableOperations = [NSMutableArray array]; @@ -572,7 +572,7 @@ static void AFNetworkReachabilityReleaseCallback(const void *info) { } - (void)enqueueBatchOfHTTPRequestOperations:(NSArray *)operations - progressBlock:(void (^)(NSUInteger numberOfCompletedOperations, NSUInteger totalNumberOfOperations))progressBlock + progressBlock:(void (^)(NSUInteger numberOfFinishedOperations, NSUInteger totalNumberOfOperations))progressBlock completionBlock:(void (^)(NSArray *operations))completionBlock { __block dispatch_group_t dispatchGroup = dispatch_group_create(); @@ -594,15 +594,15 @@ static void AFNetworkReachabilityReleaseCallback(const void *info) { originalCompletionBlock(); } - __block NSUInteger numberOfCompletedOperations = 0; + __block NSUInteger numberOfFinishedOperations = 0; [operations enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) { if ([(NSOperation *)obj isFinished]) { - numberOfCompletedOperations++; + numberOfFinishedOperations++; } }]; if (progressBlock) { - progressBlock(numberOfCompletedOperations, [operations count]); + progressBlock(numberOfFinishedOperations, [operations count]); } dispatch_group_leave(dispatchGroup);