Merge pull request robbiehanson#16 from pizthewiz/master

robbiehanson · robbiehanson · commit 97594c461422 · 2012-03-23T09:50:53.000-07:00
initialize return variables to squelch clang warnings
diff --git a/GCD/GCDAsyncUdpSocket.m b/GCD/GCDAsyncUdpSocket.m
@@ -428,7 +428,7 @@ - (id)delegate
 	}
 	else
 	{
-		__block id result;
+		__block id result = nil;
 		
 		dispatch_sync(socketQueue, ^{
 			result = delegate;
@@ -473,7 +473,7 @@ - (dispatch_queue_t)delegateQueue
 	}
 	else
 	{
-		__block dispatch_queue_t result;
+		__block dispatch_queue_t result = NULL;
 		
 		dispatch_sync(socketQueue, ^{
 			result = delegateQueue;
@@ -655,7 +655,7 @@ - (void)setIPv6Enabled:(BOOL)flag
 
 - (BOOL)isIPv4Preferred
 {
-	__block BOOL result;
+	__block BOOL result = NO;
 	
 	dispatch_block_t block = ^{
 		result = (config & kPreferIPv4) ? YES : NO;
@@ -671,7 +671,7 @@ - (BOOL)isIPv4Preferred
 
 - (BOOL)isIPv6Preferred
 {
-	__block BOOL result;
+	__block BOOL result = NO;
 	
 	dispatch_block_t block = ^{
 		result = (config & kPreferIPv6) ? YES : NO;
@@ -687,7 +687,7 @@ - (BOOL)isIPv6Preferred
 
 - (BOOL)isIPVersionNeutral
 {
-	__block BOOL result;
+	__block BOOL result = NO;
 	
 	dispatch_block_t block = ^{
 		result = (config & (kPreferIPv4 | kPreferIPv6)) == 0;
@@ -819,7 +819,7 @@ - (void)setMaxReceiveIPv6BufferSize:(uint32_t)max
 
 - (id)userData
 {
-	__block id result;
+	__block id result = nil;
 	
 	dispatch_block_t block = ^{
 		
@@ -2286,7 +2286,7 @@ - (uint16_t)localPort
 
 - (NSData *)localAddress_IPv4
 {
-	__block NSData *result;
+	__block NSData *result = nil;
 	
 	dispatch_block_t block = ^{
 		
@@ -2304,7 +2304,7 @@ - (NSData *)localAddress_IPv4
 
 - (NSString *)localHost_IPv4
 {
-	__block NSString *result;
+	__block NSString *result = nil;
 	
 	dispatch_block_t block = ^{
 		
@@ -2322,7 +2322,7 @@ - (NSString *)localHost_IPv4
 
 - (uint16_t)localPort_IPv4
 {
-	__block uint16_t result;
+	__block uint16_t result = 0;
 	
 	dispatch_block_t block = ^{
 		
@@ -2340,7 +2340,7 @@ - (uint16_t)localPort_IPv4
 
 - (NSData *)localAddress_IPv6
 {
-	__block NSData *result;
+	__block NSData *result = nil;
 	
 	dispatch_block_t block = ^{
 		
@@ -2358,7 +2358,7 @@ - (NSData *)localAddress_IPv6
 
 - (NSString *)localHost_IPv6
 {
-	__block NSString *result;
+	__block NSString *result = nil;
 	
 	dispatch_block_t block = ^{
 		
@@ -2376,7 +2376,7 @@ - (NSString *)localHost_IPv6
 
 - (uint16_t)localPort_IPv6
 {
-	__block uint16_t result;
+	__block uint16_t result = 0;
 	
 	dispatch_block_t block = ^{
 		
@@ -2455,7 +2455,7 @@ - (void)maybeUpdateCachedConnectedAddressInfo
 
 - (NSData *)connectedAddress
 {
-	__block NSData *result;
+	__block NSData *result = nil;
 	
 	dispatch_block_t block = ^{
 		
@@ -2473,7 +2473,7 @@ - (NSData *)connectedAddress
 
 - (NSString *)connectedHost
 {
-	__block NSString *result;
+	__block NSString *result = nil;
 	
 	dispatch_block_t block = ^{
 		
@@ -2491,7 +2491,7 @@ - (NSString *)connectedHost
 
 - (uint16_t)connectedPort
 {
-	__block uint16_t result;
+	__block uint16_t result = 0;
 	
 	dispatch_block_t block = ^{
 		
@@ -2509,7 +2509,7 @@ - (uint16_t)connectedPort
 
 - (BOOL)isConnected
 {
-	__block BOOL result;
+	__block BOOL result = NO;
 	
 	dispatch_block_t block = ^{
 		result = (flags & kDidConnect) ? YES : NO;
@@ -2542,7 +2542,7 @@ - (BOOL)isClosed
 
 - (BOOL)isIPv4
 {
-	__block BOOL result;
+	__block BOOL result = NO;
 	
 	dispatch_block_t block = ^{
 		
@@ -2566,7 +2566,7 @@ - (BOOL)isIPv4
 
 - (BOOL)isIPv6
 {
-	__block BOOL result;
+	__block BOOL result = NO;
 	
 	dispatch_block_t block = ^{
 		

Original file line number	Diff line number	Diff line change
`@@ -428,7 +428,7 @@ - (id)delegate`
`428`	`428`	`}`
`429`	`429`	`else`
`430`	`430`	`{`
`431`		`- __block id result;`
	`431`	`+ __block id result = nil;`
`432`	`432`
`433`	`433`	`dispatch_sync(socketQueue, ^{`
`434`	`434`	`result = delegate;`
`@@ -473,7 +473,7 @@ - (dispatch_queue_t)delegateQueue`
`473`	`473`	`}`
`474`	`474`	`else`
`475`	`475`	`{`
`476`		`- __block dispatch_queue_t result;`
	`476`	`+ __block dispatch_queue_t result = NULL;`
`477`	`477`
`478`	`478`	`dispatch_sync(socketQueue, ^{`
`479`	`479`	`result = delegateQueue;`
`@@ -655,7 +655,7 @@ - (void)setIPv6Enabled:(BOOL)flag`
`655`	`655`
`656`	`656`	`- (BOOL)isIPv4Preferred`
`657`	`657`	`{`
`658`		`- __block BOOL result;`
	`658`	`+ __block BOOL result = NO;`
`659`	`659`
`660`	`660`	`dispatch_block_t block = ^{`
`661`	`661`	`result = (config & kPreferIPv4) ? YES : NO;`
`@@ -671,7 +671,7 @@ - (BOOL)isIPv4Preferred`
`671`	`671`
`672`	`672`	`- (BOOL)isIPv6Preferred`
`673`	`673`	`{`
`674`		`- __block BOOL result;`
	`674`	`+ __block BOOL result = NO;`
`675`	`675`
`676`	`676`	`dispatch_block_t block = ^{`
`677`	`677`	`result = (config & kPreferIPv6) ? YES : NO;`
`@@ -687,7 +687,7 @@ - (BOOL)isIPv6Preferred`
`687`	`687`
`688`	`688`	`- (BOOL)isIPVersionNeutral`
`689`	`689`	`{`
`690`		`- __block BOOL result;`
	`690`	`+ __block BOOL result = NO;`
`691`	`691`
`692`	`692`	`dispatch_block_t block = ^{`
`693`	`693`	`result = (config & (kPreferIPv4 \| kPreferIPv6)) == 0;`
`@@ -819,7 +819,7 @@ - (void)setMaxReceiveIPv6BufferSize:(uint32_t)max`
`819`	`819`
`820`	`820`	`- (id)userData`
`821`	`821`	`{`
`822`		`- __block id result;`
	`822`	`+ __block id result = nil;`
`823`	`823`
`824`	`824`	`dispatch_block_t block = ^{`
`825`	`825`
`@@ -2286,7 +2286,7 @@ - (uint16_t)localPort`
`2286`	`2286`
`2287`	`2287`	`- (NSData *)localAddress_IPv4`
`2288`	`2288`	`{`
`2289`		`- __block NSData *result;`
	`2289`	`+ __block NSData *result = nil;`
`2290`	`2290`
`2291`	`2291`	`dispatch_block_t block = ^{`
`2292`	`2292`
`@@ -2304,7 +2304,7 @@ - (NSData *)localAddress_IPv4`
`2304`	`2304`
`2305`	`2305`	`- (NSString *)localHost_IPv4`
`2306`	`2306`	`{`
`2307`		`- __block NSString *result;`
	`2307`	`+ __block NSString *result = nil;`
`2308`	`2308`
`2309`	`2309`	`dispatch_block_t block = ^{`
`2310`	`2310`
`@@ -2322,7 +2322,7 @@ - (NSString *)localHost_IPv4`
`2322`	`2322`
`2323`	`2323`	`- (uint16_t)localPort_IPv4`
`2324`	`2324`	`{`
`2325`		`- __block uint16_t result;`
	`2325`	`+ __block uint16_t result = 0;`
`2326`	`2326`
`2327`	`2327`	`dispatch_block_t block = ^{`
`2328`	`2328`
`@@ -2340,7 +2340,7 @@ - (uint16_t)localPort_IPv4`
`2340`	`2340`
`2341`	`2341`	`- (NSData *)localAddress_IPv6`
`2342`	`2342`	`{`
`2343`		`- __block NSData *result;`
	`2343`	`+ __block NSData *result = nil;`
`2344`	`2344`
`2345`	`2345`	`dispatch_block_t block = ^{`
`2346`	`2346`
`@@ -2358,7 +2358,7 @@ - (NSData *)localAddress_IPv6`
`2358`	`2358`
`2359`	`2359`	`- (NSString *)localHost_IPv6`
`2360`	`2360`	`{`
`2361`		`- __block NSString *result;`
	`2361`	`+ __block NSString *result = nil;`
`2362`	`2362`
`2363`	`2363`	`dispatch_block_t block = ^{`
`2364`	`2364`
`@@ -2376,7 +2376,7 @@ - (NSString *)localHost_IPv6`
`2376`	`2376`
`2377`	`2377`	`- (uint16_t)localPort_IPv6`
`2378`	`2378`	`{`
`2379`		`- __block uint16_t result;`
	`2379`	`+ __block uint16_t result = 0;`
`2380`	`2380`
`2381`	`2381`	`dispatch_block_t block = ^{`
`2382`	`2382`
`@@ -2455,7 +2455,7 @@ - (void)maybeUpdateCachedConnectedAddressInfo`
`2455`	`2455`
`2456`	`2456`	`- (NSData *)connectedAddress`
`2457`	`2457`	`{`
`2458`		`- __block NSData *result;`
	`2458`	`+ __block NSData *result = nil;`
`2459`	`2459`
`2460`	`2460`	`dispatch_block_t block = ^{`
`2461`	`2461`
`@@ -2473,7 +2473,7 @@ - (NSData *)connectedAddress`
`2473`	`2473`
`2474`	`2474`	`- (NSString *)connectedHost`
`2475`	`2475`	`{`
`2476`		`- __block NSString *result;`
	`2476`	`+ __block NSString *result = nil;`
`2477`	`2477`
`2478`	`2478`	`dispatch_block_t block = ^{`
`2479`	`2479`
`@@ -2491,7 +2491,7 @@ - (NSString *)connectedHost`
`2491`	`2491`
`2492`	`2492`	`- (uint16_t)connectedPort`
`2493`	`2493`	`{`
`2494`		`- __block uint16_t result;`
	`2494`	`+ __block uint16_t result = 0;`
`2495`	`2495`
`2496`	`2496`	`dispatch_block_t block = ^{`
`2497`	`2497`
`@@ -2509,7 +2509,7 @@ - (uint16_t)connectedPort`
`2509`	`2509`
`2510`	`2510`	`- (BOOL)isConnected`
`2511`	`2511`	`{`
`2512`		`- __block BOOL result;`
	`2512`	`+ __block BOOL result = NO;`
`2513`	`2513`
`2514`	`2514`	`dispatch_block_t block = ^{`
`2515`	`2515`	`result = (flags & kDidConnect) ? YES : NO;`
`@@ -2542,7 +2542,7 @@ - (BOOL)isClosed`
`2542`	`2542`
`2543`	`2543`	`- (BOOL)isIPv4`
`2544`	`2544`	`{`
`2545`		`- __block BOOL result;`
	`2545`	`+ __block BOOL result = NO;`
`2546`	`2546`
`2547`	`2547`	`dispatch_block_t block = ^{`
`2548`	`2548`
`@@ -2566,7 +2566,7 @@ - (BOOL)isIPv4`
`2566`	`2566`
`2567`	`2567`	`- (BOOL)isIPv6`
`2568`	`2568`	`{`
`2569`		`- __block BOOL result;`
	`2569`	`+ __block BOOL result = NO;`
`2570`	`2570`
`2571`	`2571`	`dispatch_block_t block = ^{`
`2572`	`2572`