Merge branch 'master' of https://github.com/timshadel/asi-http-request into timshadel-master

@@ -55,20 +55,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
 	// No need for a lock here, this will always be called on the main thread
 	if (!sharedDialog) {
 	if (!sharedDialog) {
 		sharedDialog = [[self alloc] init];
 		sharedDialog = [[self alloc] init];
-		[sharedDialog setRequest:request];
-		if ([request authenticationNeeded] == ASIProxyAuthenticationNeeded) {
+		[sharedDialog setRequest:theRequest];
+		if ([theRequest authenticationNeeded] == ASIProxyAuthenticationNeeded) {
 			[sharedDialog setType:ASIProxyAuthenticationType];
 			[sharedDialog setType:ASIProxyAuthenticationType];
 		} else {
 		} else {
 			[sharedDialog setType:ASIStandardAuthenticationType];
 			[sharedDialog setType:ASIStandardAuthenticationType];
 		}
 		}
 		[sharedDialog show];
 		[sharedDialog show];
 	} else {
 	} else {
-		[requestsNeedingAuthentication addObject:request];
+		[requestsNeedingAuthentication addObject:theRequest];
 	}
 	}
 }
 }
 
 
@@ -454,7 +454,7 @@ static const NSUInteger kDomainSection = 1;
 	return cell;
 	return cell;
 }
 }
 
 
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+- (NSInteger)tableView:(UITableView *)aTableView numberOfRowsInSection:(NSInteger)section
 {
 {
 	if (section == 0) {
 	if (section == 0) {
 		return 2;
 		return 2;

@@ -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
 - (void)dealloc

@@ -11,11 +11,11 @@
 
 
 @implementation ASIS3Bucket
 @implementation ASIS3Bucket
 
 
-+ (id)bucketWithOwnerID:(NSString *)ownerID ownerName:(NSString *)ownerName
++ (id)bucketWithOwnerID:(NSString *)anOwnerID ownerName:(NSString *)anOwnerName
 {
 {
 	ASIS3Bucket *bucket = [[[self alloc] init] autorelease];
 	ASIS3Bucket *bucket = [[[self alloc] init] autorelease];
-	[bucket setOwnerID:ownerID];
-	[bucket setOwnerName:ownerName];
+	[bucket setOwnerID:anOwnerID];
+	[bucket setOwnerName:anOwnerName];
 	return bucket;
 	return bucket;
 }
 }
 
 

@@ -11,10 +11,10 @@
 
 
 @implementation ASIS3BucketObject
 @implementation ASIS3BucketObject
 
 
-+ (id)objectWithBucket:(NSString *)bucket
++ (id)objectWithBucket:(NSString *)theBucket
 {
 {
 	ASIS3BucketObject *object = [[[self alloc] init] autorelease];
 	ASIS3BucketObject *object = [[[self alloc] init] autorelease];
-	[object setBucket:bucket];
+	[object setBucket:theBucket];
 	return object;
 	return object;
 }
 }
 
 

@@ -28,32 +28,32 @@
 	return self;
 	return self;
 }
 }
 
 
-+ (id)requestWithBucket:(NSString *)bucket
++ (id)requestWithBucket:(NSString *)theBucket
 {
 {
 	ASIS3BucketRequest *request = [[[self alloc] initWithURL:nil] autorelease];
 	ASIS3BucketRequest *request = [[[self alloc] initWithURL:nil] autorelease];
-	[request setBucket:bucket];
+	[request setBucket:theBucket];
 	return request;
 	return request;
 }
 }
 
 
-+ (id)requestWithBucket:(NSString *)bucket subResource:(NSString *)subResource
++ (id)requestWithBucket:(NSString *)theBucket subResource:(NSString *)theSubResource
 {
 {
 	ASIS3BucketRequest *request = [[[self alloc] initWithURL:nil] autorelease];
 	ASIS3BucketRequest *request = [[[self alloc] initWithURL:nil] autorelease];
-	[request setBucket:bucket];
-	[request setSubResource:subResource];
+	[request setBucket:theBucket];
+	[request setSubResource:theSubResource];
 	return request;
 	return request;
 }
 }
 
 
-+ (id)PUTRequestWithBucket:(NSString *)bucket
++ (id)PUTRequestWithBucket:(NSString *)theBucket
 {
 {
-	ASIS3BucketRequest *request = [self requestWithBucket:bucket];
+	ASIS3BucketRequest *request = [self requestWithBucket:theBucket];
 	[request setRequestMethod:@"PUT"];
 	[request setRequestMethod:@"PUT"];
 	return request;
 	return request;
 }
 }
 
 
 
 
-+ (id)DELETERequestWithBucket:(NSString *)bucket
++ (id)DELETERequestWithBucket:(NSString *)theBucket
 {
 {
-	ASIS3BucketRequest *request = [self requestWithBucket:bucket];
+	ASIS3BucketRequest *request = [self requestWithBucket:theBucket];
 	[request setRequestMethod:@"DELETE"];
 	[request setRequestMethod:@"DELETE"];
 	return request;
 	return request;
 }
 }

@@ -21,62 +21,62 @@ NSString *const ASIS3StorageClassReducedRedundancy = @"REDUCED_REDUNDANCY";
 	return headRequest;
 	return headRequest;
 }
 }
 
 
-+ (id)requestWithBucket:(NSString *)bucket key:(NSString *)key
++ (id)requestWithBucket:(NSString *)theBucket key:(NSString *)theKey
 {
 {
-	ASIS3ObjectRequest *request = [[[self alloc] initWithURL:nil] autorelease];
-	[request setBucket:bucket];
-	[request setKey:key];
-	return request;
+	ASIS3ObjectRequest *newRequest = [[[self alloc] initWithURL:nil] autorelease];
+	[newRequest setBucket:theBucket];
+	[newRequest setKey:theKey];
+	return newRequest;
 }
 }
 
 
-+ (id)requestWithBucket:(NSString *)bucket key:(NSString *)key subResource:(NSString *)subResource
++ (id)requestWithBucket:(NSString *)theBucket key:(NSString *)theKey subResource:(NSString *)theSubResource
 {
 {
-	ASIS3ObjectRequest *request = [[[self alloc] initWithURL:nil] autorelease];
-	[request setSubResource:subResource];
-	[request setBucket:bucket];
-	[request setKey:key];
-	return request;
+	ASIS3ObjectRequest *newRequest = [[[self alloc] initWithURL:nil] autorelease];
+	[newRequest setSubResource:theSubResource];
+	[newRequest setBucket:theBucket];
+	[newRequest setKey:theKey];
+	return newRequest;
 }
 }
 
 
-+ (id)PUTRequestForData:(NSData *)data withBucket:(NSString *)bucket key:(NSString *)key
++ (id)PUTRequestForData:(NSData *)data withBucket:(NSString *)theBucket key:(NSString *)theKey
 {
 {
-	ASIS3ObjectRequest *request = [self requestWithBucket:bucket key:key];
-	[request appendPostData:data];
-	[request setRequestMethod:@"PUT"];
-	return request;
+	ASIS3ObjectRequest *newRequest = [self requestWithBucket:theBucket key:theKey];
+	[newRequest appendPostData:data];
+	[newRequest setRequestMethod:@"PUT"];
+	return newRequest;
 }
 }
 
 
-+ (id)PUTRequestForFile:(NSString *)filePath withBucket:(NSString *)bucket key:(NSString *)key
++ (id)PUTRequestForFile:(NSString *)filePath withBucket:(NSString *)theBucket key:(NSString *)theKey
 {
 {
-	ASIS3ObjectRequest *request = [self requestWithBucket:bucket key:key];
-	[request setPostBodyFilePath:filePath];
-	[request setShouldStreamPostDataFromDisk:YES];
-	[request setRequestMethod:@"PUT"];
-	[request setMimeType:[ASIHTTPRequest mimeTypeForFileAtPath:filePath]];
-	return request;
+	ASIS3ObjectRequest *newRequest = [self requestWithBucket:theBucket key:theKey];
+	[newRequest setPostBodyFilePath:filePath];
+	[newRequest setShouldStreamPostDataFromDisk:YES];
+	[newRequest setRequestMethod:@"PUT"];
+	[newRequest setMimeType:[ASIHTTPRequest mimeTypeForFileAtPath:filePath]];
+	return newRequest;
 }
 }
 
 
-+ (id)DELETERequestWithBucket:(NSString *)bucket key:(NSString *)key
++ (id)DELETERequestWithBucket:(NSString *)theBucket key:(NSString *)theKey
 {
 {
-	ASIS3ObjectRequest *request = [self requestWithBucket:bucket key:key];
-	[request setRequestMethod:@"DELETE"];
-	return request;
+	ASIS3ObjectRequest *newRequest = [self requestWithBucket:theBucket key:theKey];
+	[newRequest setRequestMethod:@"DELETE"];
+	return newRequest;
 }
 }
 
 
-+ (id)COPYRequestFromBucket:(NSString *)sourceBucket key:(NSString *)sourceKey toBucket:(NSString *)bucket key:(NSString *)key
++ (id)COPYRequestFromBucket:(NSString *)theSourceBucket key:(NSString *)theSourceKey toBucket:(NSString *)theBucket key:(NSString *)theKey
 {
 {
-	ASIS3ObjectRequest *request = [self requestWithBucket:bucket key:key];
-	[request setRequestMethod:@"PUT"];
-	[request setSourceBucket:sourceBucket];
-	[request setSourceKey:sourceKey];
-	return request;
+	ASIS3ObjectRequest *newRequest = [self requestWithBucket:theBucket key:theKey];
+	[newRequest setRequestMethod:@"PUT"];
+	[newRequest setSourceBucket:theSourceBucket];
+	[newRequest setSourceKey:theSourceKey];
+	return newRequest;
 }
 }
 
 
-+ (id)HEADRequestWithBucket:(NSString *)bucket key:(NSString *)key
++ (id)HEADRequestWithBucket:(NSString *)theBucket key:(NSString *)theKey
 {
 {
-	ASIS3ObjectRequest *request = [self requestWithBucket:bucket key:key];
-	[request setRequestMethod:@"HEAD"];
-	return request;
+	ASIS3ObjectRequest *newRequest = [self requestWithBucket:theBucket key:theKey];
+	[newRequest setRequestMethod:@"HEAD"];
+	return newRequest;
 }
 }
 
 
 - (id)copyWithZone:(NSZone *)zone
 - (id)copyWithZone:(NSZone *)zone