From 45880fd9a019c6f9f7f5a6cf05f5537605a0d870 Mon Sep 17 00:00:00 2001 From: Mattt Thompson Date: Mon, 24 Sep 2012 08:26:00 -0700 Subject: [PATCH] Minor refactoring and reformatting --- AFNetworking/AFHTTPRequestOperation.m | 28 ++++++++++----------------- 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/AFNetworking/AFHTTPRequestOperation.m b/AFNetworking/AFHTTPRequestOperation.m index f55fbda..1021681 100644 --- a/AFNetworking/AFHTTPRequestOperation.m +++ b/AFNetworking/AFHTTPRequestOperation.m @@ -37,32 +37,24 @@ #endif NSSet * AFContentTypesFromHTTPHeader(NSString *string) { - static NSCharacterSet *_trimCharacterSet = nil; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - _trimCharacterSet = [NSCharacterSet whitespaceAndNewlineCharacterSet]; - }); - if (!string) { return nil; } NSArray *mediaRanges = [string componentsSeparatedByString:@","]; - NSMutableSet *mutableContentTypes = [NSMutableSet setWithCapacity:mediaRanges.count]; [mediaRanges enumerateObjectsUsingBlock:^(NSString *mediaRange, NSUInteger idx, BOOL *stop) { - - NSRange startOfParameters = [mediaRange rangeOfString:@";"]; - if (startOfParameters.location != NSNotFound) { - mediaRange = [mediaRange substringToIndex:startOfParameters.location]; - } - - mediaRange = [mediaRange stringByTrimmingCharactersInSet:_trimCharacterSet]; - - if (mediaRange.length > 0) - [mutableContentTypes addObject:mediaRange]; - + NSRange parametersRange = [mediaRange rangeOfString:@";"]; + if (parametersRange.location != NSNotFound) { + mediaRange = [mediaRange substringToIndex:parametersRange.location]; + } + + mediaRange = [mediaRange stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; + + if (mediaRange.length > 0) { + [mutableContentTypes addObject:mediaRange]; + } }]; return [NSSet setWithSet:mutableContentTypes];