Zachary Waldowski

Allow compiling with the Clang/Obj-C 2.0 ABI by fixing some ivar name duplicatio…

…ns that crash the compiler.

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
... ... @@ -51,20 +51,20 @@ static const NSUInteger kDomainSection = 1;
}
}
+ (void)presentAuthenticationDialogForRequest:(ASIHTTPRequest *)request
+ (void)presentAuthenticationDialogForRequest:(ASIHTTPRequest *)theRequest
{
// No need for a lock here, this will always be called on the main thread
if (!sharedDialog) {
sharedDialog = [[self alloc] init];
[sharedDialog setRequest:request];
if ([request authenticationNeeded] == ASIProxyAuthenticationNeeded) {
[sharedDialog setRequest:theRequest];
if ([theRequest authenticationNeeded] == ASIProxyAuthenticationNeeded) {
[sharedDialog setType:ASIProxyAuthenticationType];
} else {
[sharedDialog setType:ASIStandardAuthenticationType];
}
[sharedDialog show];
} else {
[requestsNeedingAuthentication addObject:request];
[requestsNeedingAuthentication addObject:theRequest];
}
}
... ...
... ... @@ -21,20 +21,20 @@ static NSLock *readLock = nil;
}
}
+ (id)inputStreamWithFileAtPath:(NSString *)path request:(ASIHTTPRequest *)request
+ (id)inputStreamWithFileAtPath:(NSString *)path request:(ASIHTTPRequest *)theRequest
{
ASIInputStream *stream = [[[self alloc] init] autorelease];
[stream setRequest:request];
[stream setStream:[NSInputStream inputStreamWithFileAtPath:path]];
return stream;
ASIInputStream *theStream = [[[self alloc] init] autorelease];
[theStream setRequest:theRequest];
[theStream setStream:[NSInputStream inputStreamWithFileAtPath:path]];
return theStream;
}
+ (id)inputStreamWithData:(NSData *)data request:(ASIHTTPRequest *)request
+ (id)inputStreamWithData:(NSData *)data request:(ASIHTTPRequest *)theRequest
{
ASIInputStream *stream = [[[self alloc] init] autorelease];
[stream setRequest:request];
[stream setStream:[NSInputStream inputStreamWithData:data]];
return stream;
ASIInputStream *theStream = [[[self alloc] init] autorelease];
[theStream setRequest:theRequest];
[theStream setStream:[NSInputStream inputStreamWithData:data]];
return theStream;
}
- (void)dealloc
... ...