From 9a4ec5b7e838d70a449da3aa00caed13576efc7f Mon Sep 17 00:00:00 2001 From: felixLam Date: Fri, 4 Apr 2014 12:05:32 +0200 Subject: [PATCH] Fixes warning regarding shadowing local variables --- CGDWebServer/GCDWebServer.m | 4 ++-- CGDWebServer/GCDWebServerConnection.m | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CGDWebServer/GCDWebServer.m b/CGDWebServer/GCDWebServer.m index fcdbdd9..f443cb5 100644 --- a/CGDWebServer/GCDWebServer.m +++ b/CGDWebServer/GCDWebServer.m @@ -330,8 +330,8 @@ static void _NetServiceClientCallBack(CFNetServiceRef service, CFStreamError* er DNOT_REACHED(); } - int yes = 1; - setsockopt(socket, SOL_SOCKET, SO_NOSIGPIPE, &yes, sizeof(yes)); // Make sure this socket cannot generate SIG_PIPE + int noSigPipe = 1; + setsockopt(socket, SOL_SOCKET, SO_NOSIGPIPE, &noSigPipe, sizeof(noSigPipe)); // Make sure this socket cannot generate SIG_PIPE Class connectionClass = [[self class] connectionClass]; GCDWebServerConnection* connection = [[connectionClass alloc] initWithServer:self localAddress:localAddress remoteAddress:remoteAddress socket:socket]; // Connection will automatically retain itself while opened diff --git a/CGDWebServer/GCDWebServerConnection.m b/CGDWebServer/GCDWebServerConnection.m index ea7cf05..8fb85b4 100644 --- a/CGDWebServer/GCDWebServerConnection.m +++ b/CGDWebServer/GCDWebServerConnection.m @@ -99,8 +99,8 @@ static dispatch_queue_t _formatterQueue = NULL; if (buffer) { NSMutableData* data = [[NSMutableData alloc] initWithCapacity:dispatch_data_get_size(buffer)]; - dispatch_data_apply(buffer, ^bool(dispatch_data_t region, size_t offset, const void* buffer, size_t size) { - [data appendBytes:buffer length:size]; + dispatch_data_apply(buffer, ^bool(dispatch_data_t region, size_t offset, const void* bufferChunk, size_t size) { + [data appendBytes:bufferChunk length:size]; return true; }); block(data); @@ -118,8 +118,8 @@ static dispatch_queue_t _formatterQueue = NULL; if (buffer) { NSMutableData* data = [NSMutableData dataWithCapacity:kHeadersReadBuffer]; - dispatch_data_apply(buffer, ^bool(dispatch_data_t region, size_t offset, const void* buffer, size_t size) { - [data appendBytes:buffer length:size]; + dispatch_data_apply(buffer, ^bool(dispatch_data_t region, size_t offset, const void* bufferChunk, size_t size) { + [data appendBytes:bufferChunk length:size]; return true; }); NSRange range = [data rangeOfData:_separatorData options:0 range:NSMakeRange(0, data.length)]; @@ -158,8 +158,8 @@ static dispatch_queue_t _formatterQueue = NULL; if (buffer) { NSInteger remainingLength = length - dispatch_data_get_size(buffer); if (remainingLength >= 0) { - bool success = dispatch_data_apply(buffer, ^bool(dispatch_data_t region, size_t offset, const void* buffer, size_t size) { - NSInteger result = [_request write:buffer maxLength:size]; + bool success = dispatch_data_apply(buffer, ^bool(dispatch_data_t region, size_t offset, const void* bufferChunk, size_t size) { + NSInteger result = [_request write:bufferChunk maxLength:size]; if (result != (NSInteger)size) { LOG_ERROR(@"Failed writing request body on socket %i (error %i)", _socket, (int)result); return false; @@ -342,7 +342,7 @@ static dispatch_queue_t _formatterQueue = NULL; if (success) { if ([_response hasBody]) { - [self _writeBodyWithCompletionBlock:^(BOOL success) { + [self _writeBodyWithCompletionBlock:^(BOOL successInner) { [_response close]; // Can't do anything with result anyway