Avoid warnings about implicit integer conversions that change the

signedness of an integer value (-Wsign-conversion).

Avoid warnings about implicit integer conversions that change the
signedness of an integer value (-Wsign-conversion).
Jardel Weyrich
Commit c07c4068a24b5bee42e0a9578480dc644d4d6c4b c07c4068 1 parent ebde72d9
Showing 7 changed files with 47 additions and 43 deletions
Classes/ASIAuthenticationDialog.m
Classes/ASIDataCompressor.m
Classes/ASIDataDecompressor.m
Classes/ASIHTTPRequest.m
Classes/ASIInputStream.m
Classes/ASINetworkQueue.m
External/Reachability/Reachability.m
--- a/Classes/ASIAuthenticationDialog.m
View file @c07c406
+++ b/Classes/ASIAuthenticationDialog.m
View file @c07c406
@@ -193,7 +193,7 @@ static const NSUInteger kDomainSection = 1;
 - (UITextField *)textFieldInRow:(NSUInteger)row section:(NSUInteger)section
 {
 	return [[[[[self tableView] cellForRowAtIndexPath:
-			   [NSIndexPath indexPathForRow:row inSection:section]]
+			   [NSIndexPath indexPathForRow:(NSInteger)row inSection:(NSInteger)section]]
 			  contentView] subviews] objectAtIndex:0];
 }
@@ -471,8 +471,8 @@ static const NSUInteger kDomainSection = 1;
 	[textField setAutocapitalizationType:UITextAutocapitalizationTypeNone];
 	[textField setAutocorrectionType:UITextAutocorrectionTypeNo];
-	NSUInteger s = [indexPath section];
+	NSInteger s = [indexPath section];
-	NSUInteger r = [indexPath row];
+	NSInteger r = [indexPath row];
 	if (s == kUsernameSection && r == kUsernameRow) {
 		[textField setPlaceholder:@"User"];
--- a/Classes/ASIDataCompressor.m
View file @c07c406
+++ b/Classes/ASIDataCompressor.m
View file @c07c406
@@ -81,7 +81,7 @@
 	zStream.avail_in = (unsigned int)length;
 	zStream.avail_out = 0;
-	NSInteger bytesProcessedAlready = zStream.total_out;
+	NSUInteger bytesProcessedAlready = zStream.total_out;
 	while (zStream.avail_out == 0) {
 		if (zStream.total_out-bytesProcessedAlready >= [outputData length]) {
@@ -174,7 +174,7 @@
 		}
 		// Attempt to deflate the chunk of data
-		outputData = [compressor compressBytes:inputData length:readLength error:&theError shouldFinish:readLength < DATA_CHUNK_SIZE ];
+		outputData = [compressor compressBytes:inputData length:(NSUInteger)readLength error:&theError shouldFinish:readLength < DATA_CHUNK_SIZE];
 		if (theError) {
 			if (err) {
 				*err = theError;
--- a/Classes/ASIDataDecompressor.m
View file @c07c406
+++ b/Classes/ASIDataDecompressor.m
View file @c07c406
@@ -78,7 +78,7 @@
 	zStream.avail_in = (unsigned int)length;
 	zStream.avail_out = 0;
-	NSInteger bytesProcessedAlready = zStream.total_out;
+	NSUInteger bytesProcessedAlready = zStream.total_out;
 	while (zStream.avail_in != 0) {
 		if (zStream.total_out-bytesProcessedAlready >= [outputData length]) {
@@ -155,7 +155,7 @@
     while ([decompressor streamReady]) {
 		// Read some data from the file
-		readLength = [inputStream read:inputData maxLength:DATA_CHUNK_SIZE]; 
+		readLength = [inputStream read:inputData maxLength:DATA_CHUNK_SIZE];
 		// Make sure nothing went wrong
 		if ([inputStream streamStatus] == NSStreamStatusError) {
@@ -171,7 +171,7 @@
 		}
 		// Attempt to inflate the chunk of data
-		outputData = [decompressor uncompressBytes:inputData length:readLength error:&theError];
+		outputData = [decompressor uncompressBytes:inputData length:(NSUInteger)readLength error:&theError];
 		if (theError) {
 			if (err) {
 				*err = theError;
--- a/Classes/ASIHTTPRequest.m
View file @c07c406
+++ b/Classes/ASIHTTPRequest.m
View file @c07c406
@@ -589,18 +589,21 @@ static NSOperationQueue *sharedQueue = nil;
 	[self setupPostBody];
 	NSInputStream *stream = [[[NSInputStream alloc] initWithFileAtPath:file] autorelease];
 	[stream open];
-	NSUInteger bytesRead;
 	while ([stream hasBytesAvailable]) {
 		unsigned char buffer[1024*256];
-		bytesRead = [stream read:buffer maxLength:sizeof(buffer)];
+		NSInteger bytesRead = [stream read:buffer maxLength:sizeof(buffer)];
 		if (bytesRead == 0) {
+			// 0 indicates that the end of the buffer was reached.
+			break;
+		} else if (bytesRead < 0) {
+			// A negative number means that the operation failed.
 			break;
 		}
 		if ([self shouldStreamPostDataFromDisk]) {
-			[[self postBodyWriteStream] write:buffer maxLength:bytesRead];
+			[[self postBodyWriteStream] write:buffer maxLength:(NSUInteger)bytesRead];
 		} else {
-			[[self postBody] appendData:[NSData dataWithBytes:buffer length:bytesRead]];
+			[[self postBody] appendData:[NSData dataWithBytes:buffer length:(NSUInteger)bytesRead]];
 		}
 	}
 	[stream close];
@@ -1343,7 +1346,7 @@ static NSOperationQueue *sharedQueue = nil;
 		if (![self connectionInfo]) {
 			[self setConnectionInfo:[NSMutableDictionary dictionary]];
 			nextConnectionNumberToCreate++;
-			[[self connectionInfo] setObject:[NSNumber numberWithInt:nextConnectionNumberToCreate] forKey:@"id"];
+			[[self connectionInfo] setObject:[NSNumber numberWithInt:(int)nextConnectionNumberToCreate] forKey:@"id"];
 			[[self connectionInfo] setObject:[[self url] host] forKey:@"host"];
 			[[self connectionInfo] setObject:[NSNumber numberWithInt:[[[self url] port] intValue]] forKey:@"port"];
 			[[self connectionInfo] setObject:[[self url] scheme] forKey:@"scheme"];
@@ -1412,7 +1415,7 @@ static NSOperationQueue *sharedQueue = nil;
 	if (![self mainRequest]) {
 		if ([self shouldResetUploadProgress]) {
 			if ([self showAccurateProgress]) {
-				[self incrementUploadSizeBy:[self postLength]];
+				[self incrementUploadSizeBy:(long long)[self postLength]];
 			} else {
 				[self incrementUploadSizeBy:1];	 
 			}
@@ -1759,7 +1762,7 @@ static NSOperationQueue *sharedQueue = nil;
 	// We will remove this from any progress display, as kCFStreamPropertyHTTPRequestBytesWrittenCount does not tell us how much data has actually be written
 	if ([self uploadBufferSize] == 0 && [self totalBytesSent] != [self postLength]) {
 		[self setUploadBufferSize:[self totalBytesSent]];
-		[self incrementUploadSizeBy:-[self uploadBufferSize]];
+		[self incrementUploadSizeBy:-(long long)[self uploadBufferSize]];
 	}
 	unsigned long long value = 0;
@@ -1819,7 +1822,7 @@ static NSOperationQueue *sharedQueue = nil;
 -(void)removeUploadProgressSoFar
 {
-	long long progressToRemove = -[self totalBytesSent];
+	long long progressToRemove = -(long long)[self totalBytesSent];
 	[ASIHTTPRequest performSelector:@selector(request:didSendBytes:) onTarget:&queue withObject:self amount:&progressToRemove callerToRetain:self];
 	[ASIHTTPRequest performSelector:@selector(request:didSendBytes:) onTarget:&uploadProgressDelegate withObject:self amount:&progressToRemove callerToRetain:self];
 	[ASIHTTPRequest updateProgressIndicator:&uploadProgressDelegate withProgress:0 ofTotal:[self postLength]];
@@ -1827,7 +1830,7 @@ static NSOperationQueue *sharedQueue = nil;
 	#if NS_BLOCKS_AVAILABLE
     if(bytesSentBlock){
 		unsigned long long totalSize = [self postLength];
-		[self performBlockOnMainThread:^{  if (bytesSentBlock) { bytesSentBlock(progressToRemove, totalSize); }}];
+		[self performBlockOnMainThread:^{  if (bytesSentBlock) { bytesSentBlock((unsigned long long)progressToRemove, totalSize); }}];
 	}
 	#endif
 }
@@ -2243,7 +2246,7 @@ static NSOperationQueue *sharedQueue = nil;
 			} else {
 				[theRequest setContentLength:length];
 				if ([self showAccurateProgress] && [self shouldResetDownloadProgress]) {
-					[theRequest incrementDownloadSizeBy:[theRequest contentLength]+[theRequest partialDownloadSize]];
+					[theRequest incrementDownloadSizeBy:(long long)[theRequest contentLength]+(long long)[theRequest partialDownloadSize]];
 				}
 			}
@@ -3304,18 +3307,18 @@ static NSOperationQueue *sharedQueue = nil;
 				[self setDataDecompressor:[ASIDataDecompressor decompressor]];
 			}
 			NSError *err = nil;
-			inflatedData = [[self dataDecompressor] uncompressBytes:buffer length:bytesRead error:&err];
+			inflatedData = [[self dataDecompressor] uncompressBytes:buffer length:(NSUInteger)bytesRead error:&err];
 			if (err) {
 				[self failWithError:err];
 				return;
 			}
 		}
-		[self setTotalBytesRead:[self totalBytesRead]+bytesRead];
+		[self setTotalBytesRead:[self totalBytesRead]+(NSUInteger)bytesRead];
 		[self setLastActivityTime:[NSDate date]];
 		// For bandwidth measurement / throttling
-		[ASIHTTPRequest incrementBandwidthUsedInLastSecond:bytesRead];
+		[ASIHTTPRequest incrementBandwidthUsedInLastSecond:(NSUInteger)bytesRead];
 		// If we need to redirect, and have automatic redirect on, and might be resuming a download, let's do nothing with the content
 		if ([self needsRedirect] && [self shouldRedirect] && [self allowResumeForFileDownloads]) {
@@ -3338,7 +3341,7 @@ static NSOperationQueue *sharedQueue = nil;
 			if ([self isResponseCompressed] && ![self shouldWaitToInflateCompressedResponses]) {
 				data = inflatedData;
 			} else {
-				data = [NSData dataWithBytes:buffer length:bytesRead];
+				data = [NSData dataWithBytes:buffer length:(NSUInteger)bytesRead];
 			}
 			[self performSelectorOnMainThread:@selector(passOnReceivedData:) withObject:data waitUntilDone:[NSThread isMainThread]];
@@ -3352,7 +3355,7 @@ static NSOperationQueue *sharedQueue = nil;
 					if ([[self responseHeaders] objectForKey:@"Content-Range"]) {
 						append = YES;
 					} else {
-						[self incrementDownloadSizeBy:-[self partialDownloadSize]];
+						[self incrementDownloadSizeBy:-(long long)[self partialDownloadSize]];
 						[self setPartialDownloadSize:0];
 					}
 				}
@@ -3361,7 +3364,7 @@ static NSOperationQueue *sharedQueue = nil;
 				[[self fileDownloadOutputStream] open];
 			}
-			[[self fileDownloadOutputStream] write:buffer maxLength:bytesRead];
+			[[self fileDownloadOutputStream] write:buffer maxLength:(NSUInteger)bytesRead];
 			if ([self isResponseCompressed] && ![self shouldWaitToInflateCompressedResponses]) {
@@ -3383,7 +3386,7 @@ static NSOperationQueue *sharedQueue = nil;
 			if ([self isResponseCompressed] && ![self shouldWaitToInflateCompressedResponses]) {
 				[rawResponseData appendData:inflatedData];
 			} else {
-				[rawResponseData appendBytes:buffer length:bytesRead];
+				[rawResponseData appendBytes:buffer length:(NSUInteger)bytesRead];
 			}
 		}
     }
@@ -3589,7 +3592,7 @@ static NSOperationQueue *sharedQueue = nil;
 		} else {
 			[theRequest setRawResponseData:[NSMutableData dataWithData:[[self downloadCache] cachedResponseDataForURL:[self url]]]];
 		}
-		[theRequest setContentLength:[[[self responseHeaders] objectForKey:@"Content-Length"] longLongValue]];
+		[theRequest setContentLength:(unsigned long long)[[[self responseHeaders] objectForKey:@"Content-Length"] longLongValue]];
 		[theRequest setTotalBytesRead:[self contentLength]];
 		[theRequest parseStringEncodingFromHeaders];
@@ -3938,8 +3941,9 @@ static NSOperationQueue *sharedQueue = nil;
 		// If your PAC file is larger than 16KB, you're just being cruel.
 		uint8_t buf[16384];
 		NSInteger len = [(NSInputStream *)stream read:buf maxLength:16384];
-		if (len) {
+		// Append only if something was actually read.
-			[[self PACFileData] appendBytes:(const void *)buf length:len];
+		if (len > 0) {
+			[[self PACFileData] appendBytes:(const void *)buf length:(NSUInteger)len];
 		}
 	} else if (eventCode == NSStreamEventErrorOccurred || eventCode == NSStreamEventEndEncountered) {
@@ -4821,14 +4825,14 @@ static NSOperationQueue *sharedQueue = nil;
 + (NSString*)base64forData:(NSData*)theData {
 	const uint8_t* input = (const uint8_t*)[theData bytes];
-	NSInteger length = [theData length];
+	NSUInteger length = [theData length];
     static char table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
     NSMutableData* data = [NSMutableData dataWithLength:((length + 2) / 3) * 4];
     uint8_t* output = (uint8_t*)data.mutableBytes;
-	NSInteger i,i2;
+	NSUInteger i,i2;
     for (i=0; i < length; i += 3) {
         NSInteger value = 0;
 		for (i2=0; i2<3; i2++) {
@@ -4839,10 +4843,10 @@ static NSOperationQueue *sharedQueue = nil;
         }
         NSInteger theIndex = (i / 3) * 4;
-        output[theIndex + 0] =                    table[(value >> 18) & 0x3F];
+        output[theIndex + 0] =                    (uint8_t)table[(value >> 18) & 0x3F];
-        output[theIndex + 1] =                    table[(value >> 12) & 0x3F];
+        output[theIndex + 1] =                    (uint8_t)table[(value >> 12) & 0x3F];
-        output[theIndex + 2] = (i + 1) < length ? table[(value >> 6)  & 0x3F] : '=';
+        output[theIndex + 2] = (i + 1) < length ? (uint8_t)table[(value >> 6)  & 0x3F] : '=';
-        output[theIndex + 3] = (i + 2) < length ? table[(value >> 0)  & 0x3F] : '=';
+        output[theIndex + 3] = (i + 2) < length ? (uint8_t)table[(value >> 0)  & 0x3F] : '=';
     }
     return [[[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding] autorelease];
--- a/Classes/ASIInputStream.m
View file @c07c406
+++ b/Classes/ASIInputStream.m
View file @c07c406
@@ -61,7 +61,7 @@ static NSLock *readLock = nil;
 	[readLock unlock];
 	NSInteger rv = [stream read:buffer maxLength:toRead];
 	if (rv > 0)
-		[ASIHTTPRequest incrementBandwidthUsedInLastSecond:rv];
+		[ASIHTTPRequest incrementBandwidthUsedInLastSecond:(NSUInteger)rv];
 	return rv;
 }
--- a/Classes/ASINetworkQueue.m
View file @c07c406
+++ b/Classes/ASINetworkQueue.m
View file @c07c406
@@ -159,7 +159,7 @@
 			}
 		}
 		[request buildPostBody];
-		[self request:nil incrementUploadSizeBy:[request postLength]];
+		[self request:nil incrementUploadSizeBy:(long long)[request postLength]];
 	} else {
@@ -233,7 +233,7 @@
 - (void)request:(ASIHTTPRequest *)request didReceiveBytes:(long long)bytes
 {
-	[self setBytesDownloadedSoFar:[self bytesDownloadedSoFar]+bytes];
+	[self setBytesDownloadedSoFar:[self bytesDownloadedSoFar]+(unsigned long long)bytes];
 	if ([self downloadProgressDelegate]) {
 		[ASIHTTPRequest updateProgressIndicator:&downloadProgressDelegate withProgress:[self bytesDownloadedSoFar] ofTotal:[self totalBytesToDownload]];
 	}
@@ -241,7 +241,7 @@
 - (void)request:(ASIHTTPRequest *)request didSendBytes:(long long)bytes
 {
-	[self setBytesUploadedSoFar:[self bytesUploadedSoFar]+bytes];
+	[self setBytesUploadedSoFar:[self bytesUploadedSoFar]+(unsigned long long)bytes];
 	if ([self uploadProgressDelegate]) {
 		[ASIHTTPRequest updateProgressIndicator:&uploadProgressDelegate withProgress:[self bytesUploadedSoFar] ofTotal:[self totalBytesToUpload]];
 	}
@@ -249,12 +249,12 @@
 - (void)request:(ASIHTTPRequest *)request incrementDownloadSizeBy:(long long)newLength
 {
-	[self setTotalBytesToDownload:[self totalBytesToDownload]+newLength];
+	[self setTotalBytesToDownload:[self totalBytesToDownload]+(unsigned long long)newLength];
 }
 - (void)request:(ASIHTTPRequest *)request incrementUploadSizeBy:(long long)newLength
 {
-	[self setTotalBytesToUpload:[self totalBytesToUpload]+newLength];
+	[self setTotalBytesToUpload:[self totalBytesToUpload]+(unsigned long long)newLength];
 }
--- a/External/Reachability/Reachability.m
View file @c07c406
+++ b/External/Reachability/Reachability.m
View file @c07c406
@@ -442,9 +442,9 @@ const SCNetworkReachabilityFlags kConnectionDown =  kSCNetworkReachabilityFlagsC
 		if (flags & kSCNetworkReachabilityFlagsIsWWAN) { return kReachableViaWWAN; }
 		// Clear moot bits.
-		flags &= ~kSCNetworkReachabilityFlagsReachable;
+		flags &= ~(uint32_t)kSCNetworkReachabilityFlagsReachable;
-		flags &= ~kSCNetworkReachabilityFlagsIsDirect;
+		flags &= ~(uint32_t)kSCNetworkReachabilityFlagsIsDirect;
-		flags &= ~kSCNetworkReachabilityFlagsIsLocalAddress; // kInternetConnection is local.
+		flags &= ~(uint32_t)kSCNetworkReachabilityFlagsIsLocalAddress; // kInternetConnection is local.
 		// Reachability Flag Status: -R ct---xx Connection down.
 		if (flags == kConnectionDown) { return kNotReachable; }