Merge branch 'experimental-1.0RC2' of github.com:AFNetworking/AFNetworking into experimental-1.0RC2

This commit is contained in:
Mattt Thompson 2012-08-04 15:25:28 -04:00
commit 9ad76f02fc
2 changed files with 3 additions and 3 deletions

View file

@ -703,7 +703,7 @@ static inline NSString * AFMultipartFormFinalBoundary() {
self.request = request; self.request = request;
self.stringEncoding = encoding; self.stringEncoding = encoding;
self.temporaryFilePath = [AFMultipartTemporaryFileDirectoryPath() stringByAppendingPathComponent:[NSString stringWithFormat:@"%u", [[self.request URL] hash]]]; self.temporaryFilePath = [AFMultipartTemporaryFileDirectoryPath() stringByAppendingPathComponent:[NSString stringWithFormat:@"%lu", [[self.request URL] hash]]];
self.outputStream = [NSOutputStream outputStreamToFileAtPath:self.temporaryFilePath append:NO]; self.outputStream = [NSOutputStream outputStreamToFileAtPath:self.temporaryFilePath append:NO];
NSRunLoop *runLoop = [NSRunLoop currentRunLoop]; NSRunLoop *runLoop = [NSRunLoop currentRunLoop];

View file

@ -76,11 +76,11 @@ static NSString * AFStringFromIndexSet(NSIndexSet *indexSet) {
} }
if (range.length == 1) { if (range.length == 1) {
[string appendFormat:@"%u", range.location]; [string appendFormat:@"%lu", range.location];
} else { } else {
NSUInteger firstIndex = range.location; NSUInteger firstIndex = range.location;
NSUInteger lastIndex = firstIndex + range.length - 1; NSUInteger lastIndex = firstIndex + range.length - 1;
[string appendFormat:@"%u-%u", firstIndex, lastIndex]; [string appendFormat:@"%lu-%lu", firstIndex, lastIndex];
} }
range.location = nextIndex; range.location = nextIndex;