Skip to content
This repository has been archived by the owner on Jan 17, 2023. It is now read-only.

Commit

Permalink
Merge pull request #422 from tewha/master
Browse files Browse the repository at this point in the history
Fix to pull 420
  • Loading branch information
mattt committed Jul 24, 2012
2 parents b9641ed + cc35e61 commit 877333a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion AFNetworking/AFHTTPClient.m
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@ - (id)initWithURLRequest:(NSMutableURLRequest *)request
self.request = request;
self.stringEncoding = encoding;

self.temporaryFilePath = [AFMultipartTemporaryFileDirectoryPath() stringByAppendingPathComponent:[NSString stringWithFormat:@"%lu", [[self.request URL] hash]]];
self.temporaryFilePath = [AFMultipartTemporaryFileDirectoryPath() stringByAppendingPathComponent:[NSString stringWithFormat:@"%lu", (long)[[self.request URL] hash]]];
self.outputStream = [NSOutputStream outputStreamToFileAtPath:self.temporaryFilePath append:NO];

NSRunLoop *runLoop = [NSRunLoop currentRunLoop];
Expand Down
4 changes: 2 additions & 2 deletions AFNetworking/AFHTTPRequestOperation.m
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ static void AFSwizzleClassMethodWithImplementation(Class klass, SEL selector, IM
}

if (range.length == 1) {
[string appendFormat:@"%lu", range.location];
[string appendFormat:@"%lu", (long)range.location];
} else {
NSUInteger firstIndex = range.location;
NSUInteger lastIndex = firstIndex + range.length - 1;
[string appendFormat:@"%lu-%lu", firstIndex, lastIndex];
[string appendFormat:@"%lu-%lu", (long)firstIndex, (long)lastIndex];
}

range.location = nextIndex;
Expand Down
2 changes: 1 addition & 1 deletion Example/Classes/Models/Tweet.m
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ + (void)publicTimelineTweetsWithBlock:(void (^)(NSArray *tweets))block {
#if __IPHONE_OS_VERSION_MIN_REQUIRED
[[[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Error", nil) message:[error localizedDescription] delegate:nil cancelButtonTitle:nil otherButtonTitles:NSLocalizedString(@"OK", nil), nil] show];
#else
[[NSAlert alertWithMessageText:NSLocalizedString(@"Error", nil) defaultButton:NSLocalizedString(@"OK", nil) alternateButton:nil otherButton:nil informativeTextWithFormat:[error localizedDescription]] runModal];
[[NSAlert alertWithMessageText:NSLocalizedString(@"Error", nil) defaultButton:NSLocalizedString(@"OK", nil) alternateButton:nil otherButton:nil informativeTextWithFormat:@"%@",[error localizedDescription]] runModal];
#endif
if (block) {
block(nil);
Expand Down

0 comments on commit 877333a

Please sign in to comment.