And now 721 warnings...

illumineX · Jul 5, 2016 · b96f497 · b96f497
1 parent 8ce86d4
commit b96f497
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 22 deletions.
diff --git a/LFWebAPIKit/NSData+LFHTTPFormExtensions.m b/LFWebAPIKit/NSData+LFHTTPFormExtensions.m
@@ -34,14 +34,14 @@ + (id)dataAsWWWURLEncodedFormFromDictionary:(NSDictionary *)formDictionary
     NSMutableString *combinedDataString = [NSMutableString string];
     NSEnumerator *enumerator = [formDictionary keyEnumerator];
 
-    id key = [enumerator nextObject];
+    NSString *key = [enumerator nextObject];
     if (key) {
-        id value = [formDictionary objectForKey:key];
-        [combinedDataString appendString:[NSString stringWithFormat:@"%@=%@", [(NSString*)key stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding], [value stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]];
+        NSString *value = [[formDictionary objectForKey:key] description];
+        [combinedDataString appendString:[NSString stringWithFormat:@"%@=%@", [key stringByAddingPercentEncodingWithAllowedCharacters: [NSCharacterSet URLQueryAllowedCharacterSet]], [value stringByAddingPercentEncodingWithAllowedCharacters: [NSCharacterSet URLQueryAllowedCharacterSet]]]];
 
 		while ((key = [enumerator nextObject])) {
-			value = [formDictionary objectForKey:key];
-			[combinedDataString appendString:[NSString stringWithFormat:@"&%@=%@", [(NSString*)key stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding], [value stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]];
+			value = [[formDictionary objectForKey:key] description];
+            [combinedDataString appendString:[NSString stringWithFormat:@"%@=%@", [key stringByAddingPercentEncodingWithAllowedCharacters: [NSCharacterSet URLQueryAllowedCharacterSet]], [value stringByAddingPercentEncodingWithAllowedCharacters: [NSCharacterSet URLQueryAllowedCharacterSet]]]];
 		}
 	}
 

diff --git a/Source/OFUtilities.m b/Source/OFUtilities.m
@@ -56,13 +56,7 @@
 
 NSString *OFEscapedURLStringFromNSStringWithExtraEscapedChars(NSString *inStr, NSString *inEscChars)
 {
-	CFStringRef escaped = CFURLCreateStringByAddingPercentEscapes(NULL, (CFStringRef)inStr, NULL, (CFStringRef)inEscChars, kCFStringEncodingUTF8);
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4	
-	return (NSString *)[(NSString*)escaped autorelease];			    
-#else
-	return (NSString *)[NSMakeCollectable(escaped) autorelease];			    
-#endif    
+    return [inStr stringByAddingPercentEncodingWithAllowedCharacters: [NSCharacterSet characterSetWithCharactersInString:inEscChars]];
 }
 
 NSString *OFGenerateUUIDString(void)

diff --git a/Source/ObjectiveFlickr.m b/Source/ObjectiveFlickr.m
@@ -516,18 +516,16 @@ - (BOOL)callAPIMethodWithGET:(NSString *)inMethodName arguments:(NSDictionary *)
     NSMutableString *combinedDataString = [NSMutableString string];
     NSEnumerator *enumerator = [formDictionary keyEnumerator];
 
-    id key = [enumerator nextObject];
+    NSString *key = [enumerator nextObject];
     if (key) {
-        id value = [formDictionary objectForKey:key];
-        [combinedDataString appendString:[NSString stringWithFormat:@"%@=%@", 
-                                          [(NSString*)key stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding],
-                                          OFEscapedURLStringFromNSStringWithExtraEscapedChars([value description], kEscapeChars)]];
+        NSString *value = [[formDictionary objectForKey:key] description];
+        [combinedDataString appendString:[NSString stringWithFormat:@"%@=%@", [key stringByAddingPercentEncodingWithAllowedCharacters: [NSCharacterSet URLQueryAllowedCharacterSet]], [value stringByAddingPercentEncodingWithAllowedCharacters: [NSCharacterSet URLQueryAllowedCharacterSet]]]];
 
-		while ((key = [enumerator nextObject])) {
-			value = [formDictionary objectForKey:key];
-			[combinedDataString appendString:[NSString stringWithFormat:@"&%@=%@", [(NSString*)key stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding], OFEscapedURLStringFromNSStringWithExtraEscapedChars([value description], kEscapeChars)]];
-		}
-	}
+        while ((key = [enumerator nextObject])) {
+            value = [[formDictionary objectForKey:key] description];
+            [combinedDataString appendString:[NSString stringWithFormat:@"%@=%@", [key stringByAddingPercentEncodingWithAllowedCharacters: [NSCharacterSet URLQueryAllowedCharacterSet]], [value stringByAddingPercentEncodingWithAllowedCharacters: [NSCharacterSet URLQueryAllowedCharacterSet]]]];
+        }
+    }
 
     return [combinedDataString dataUsingEncoding:NSUTF8StringEncoding allowLossyConversion:NO];    
 }