Apply patch from Sean McBride for some compiler warnings and other trivialities. Resolves issue robbiehanson#97.

robbiehanson · robbiehanson · commit d253652ec3b7 · 2011-05-29T20:28:19.000Z
diff --git a/GCD/GCDAsyncSocket.m b/GCD/GCDAsyncSocket.m
@@ -592,7 +592,7 @@ - (NSUInteger)readLengthForTermWithPreBuffer:(NSData *)preBuffer found:(BOOL *)f
 		maxPreBufferLength = preBufferLength;
 	}
 	
-	Byte seq[termLength];
+	uint8_t seq[termLength];
 	const void *termBuf = [term bytes];
 	
 	NSUInteger bufLen = MIN(bytesDone, (termLength - 1));
@@ -820,9 +820,9 @@ - (id)initWithDelegate:(id)aDelegate delegateQueue:(dispatch_queue_t)dq socketQu
 		{
 			NSString *assertMsg = @"The given socketQueue parameter must not be a concurrent queue.";
 			
-			NSAssert(sq != dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), assertMsg);
-			NSAssert(sq != dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), assertMsg);
-			NSAssert(sq != dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), assertMsg);
+			NSAssert(sq != dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), @"%@", assertMsg);
+			NSAssert(sq != dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), @"%@", assertMsg);
+			NSAssert(sq != dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), @"%@", assertMsg);
 			
 			dispatch_retain(sq);
 			socketQueue = sq;
@@ -1789,7 +1789,7 @@ - (BOOL)connectToHost:(NSString *)host
                onPort:(UInt16)port
          viaInterface:(NSString *)interface
           withTimeout:(NSTimeInterval)timeout
-                error:(NSError **)errPtr;
+                error:(NSError **)errPtr
 {
 	LogTrace();
 	
@@ -3625,7 +3625,7 @@ - (void)readDataToData:(NSData *)data
              maxLength:(NSUInteger)length
                    tag:(long)tag
 {
-	if (data == nil || [data length] == 0) return;
+	if ([data length] == 0) return;
 	if (offset > [buffer length]) return;
 	if (length > 0 && length < [data length]) return;
 	
@@ -4567,7 +4567,7 @@ - (void)doReadTimeoutWithExtension:(NSTimeInterval)timeoutExtension
 
 - (void)writeData:(NSData *)data withTimeout:(NSTimeInterval)timeout tag:(long)tag
 {
-	if (data == nil || [data length] == 0) return;
+	if ([data length] == 0) return;
 	
 	GCDAsyncWritePacket *packet = [[GCDAsyncWritePacket alloc] initWithData:data timeout:timeout tag:tag];
 	
@@ -5421,7 +5421,7 @@ - (OSStatus)sslWriteWithBuffer:(const void *)buffer length:(size_t *)bufferLengt
 	return errSSLWouldBlock;
 }
 
-OSStatus SSLReadFunction(SSLConnectionRef connection, void *data, size_t *dataLength)
+static OSStatus SSLReadFunction(SSLConnectionRef connection, void *data, size_t *dataLength)
 {
 	GCDAsyncSocket *asyncSocket = (GCDAsyncSocket *)connection;
 	
@@ -5430,7 +5430,7 @@ OSStatus SSLReadFunction(SSLConnectionRef connection, void *data, size_t *dataLe
 	return [asyncSocket sslReadWithBuffer:data length:dataLength];
 }
 
-OSStatus SSLWriteFunction(SSLConnectionRef connection, const void *data, size_t *dataLength)
+static OSStatus SSLWriteFunction(SSLConnectionRef connection, const void *data, size_t *dataLength)
 {
 	GCDAsyncSocket *asyncSocket = (GCDAsyncSocket *)connection;
 	

Original file line number	Diff line number	Diff line change
`@@ -592,7 +592,7 @@ - (NSUInteger)readLengthForTermWithPreBuffer:(NSData )preBuffer found:(BOOL )f`
`592`	`592`	`maxPreBufferLength = preBufferLength;`
`593`	`593`	`}`
`594`	`594`
`595`		`- Byte seq[termLength];`
	`595`	`+ uint8_t seq[termLength];`
`596`	`596`	`const void *termBuf = [term bytes];`
`597`	`597`
`598`	`598`	`NSUInteger bufLen = MIN(bytesDone, (termLength - 1));`
`@@ -820,9 +820,9 @@ - (id)initWithDelegate:(id)aDelegate delegateQueue:(dispatch_queue_t)dq socketQu`
`820`	`820`	`{`
`821`	`821`	`NSString *assertMsg = @"The given socketQueue parameter must not be a concurrent queue.";`
`822`	`822`
`823`		`- NSAssert(sq != dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), assertMsg);`
`824`		`- NSAssert(sq != dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), assertMsg);`
`825`		`- NSAssert(sq != dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), assertMsg);`
	`823`	`+ NSAssert(sq != dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), @"%@", assertMsg);`
	`824`	`+ NSAssert(sq != dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), @"%@", assertMsg);`
	`825`	`+ NSAssert(sq != dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), @"%@", assertMsg);`
`826`	`826`
`827`	`827`	`dispatch_retain(sq);`
`828`	`828`	`socketQueue = sq;`
`@@ -1789,7 +1789,7 @@ - (BOOL)connectToHost:(NSString *)host`
`1789`	`1789`	`onPort:(UInt16)port`
`1790`	`1790`	`viaInterface:(NSString *)interface`
`1791`	`1791`	`withTimeout:(NSTimeInterval)timeout`
`1792`		`- error:(NSError **)errPtr;`
	`1792`	`+ error:(NSError **)errPtr`
`1793`	`1793`	`{`
`1794`	`1794`	`LogTrace();`
`1795`	`1795`
`@@ -3625,7 +3625,7 @@ - (void)readDataToData:(NSData *)data`
`3625`	`3625`	`maxLength:(NSUInteger)length`
`3626`	`3626`	`tag:(long)tag`
`3627`	`3627`	`{`
`3628`		`- if (data == nil \|\| [data length] == 0) return;`
	`3628`	`+ if ([data length] == 0) return;`
`3629`	`3629`	`if (offset > [buffer length]) return;`
`3630`	`3630`	`if (length > 0 && length < [data length]) return;`
`3631`	`3631`
`@@ -4567,7 +4567,7 @@ - (void)doReadTimeoutWithExtension:(NSTimeInterval)timeoutExtension`
`4567`	`4567`
`4568`	`4568`	`- (void)writeData:(NSData *)data withTimeout:(NSTimeInterval)timeout tag:(long)tag`
`4569`	`4569`	`{`
`4570`		`- if (data == nil \|\| [data length] == 0) return;`
	`4570`	`+ if ([data length] == 0) return;`
`4571`	`4571`
`4572`	`4572`	`GCDAsyncWritePacket *packet = [[GCDAsyncWritePacket alloc] initWithData:data timeout:timeout tag:tag];`
`4573`	`4573`
`@@ -5421,7 +5421,7 @@ - (OSStatus)sslWriteWithBuffer:(const void )buffer length:(size_t )bufferLengt`
`5421`	`5421`	`return errSSLWouldBlock;`
`5422`	`5422`	`}`
`5423`	`5423`
`5424`		`-OSStatus SSLReadFunction(SSLConnectionRef connection, void data, size_t dataLength)`
	`5424`	`+static OSStatus SSLReadFunction(SSLConnectionRef connection, void data, size_t dataLength)`
`5425`	`5425`	`{`
`5426`	`5426`	`GCDAsyncSocket asyncSocket = (GCDAsyncSocket )connection;`
`5427`	`5427`
`@@ -5430,7 +5430,7 @@ OSStatus SSLReadFunction(SSLConnectionRef connection, void data, size_t dataLe`
`5430`	`5430`	`return [asyncSocket sslReadWithBuffer:data length:dataLength];`
`5431`	`5431`	`}`
`5432`	`5432`
`5433`		`-OSStatus SSLWriteFunction(SSLConnectionRef connection, const void data, size_t dataLength)`
	`5433`	`+static OSStatus SSLWriteFunction(SSLConnectionRef connection, const void data, size_t dataLength)`
`5434`	`5434`	`{`
`5435`	`5435`	`GCDAsyncSocket asyncSocket = (GCDAsyncSocket )connection;`
`5436`	`5436`