github/GCDWebServer
4
0
Fork 0
mirror of https://github.com/swisspol/GCDWebServer.git synced 2026-02-11 00:00:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use strerror() consistently

Browse Source
This commit is contained in:
Pierre-Olivier Latour
2014-04-15 23:34:04 -03:00
parent 55a9abd506
commit c170fb4fd3
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
GCDWebServer/Core/GCDWebServer.m
View File

@@ -207,7 +207,7 @@ static void _NetServiceClientCallBack(CFNetServiceRef service, CFStreamError* er
@autoreleasepool {
int result = close(listeningSocket);
if (result != 0) {
LOG_ERROR(@"Failed closing socket (%i): %s", errno, strerror(errno));
LOG_ERROR(@"Failed closing listening socket: %s (%i)", strerror(errno), errno);
} else {
LOG_DEBUG(@"Did close listening socket %i", listeningSocket);
}
@@ -243,7 +243,7 @@ static void _NetServiceClientCallBack(CFNetServiceRef service, CFStreamError* er
[connection release];
#endif
} else {
LOG_ERROR(@"Failed accepting socket (%i): %s", errno, strerror(errno));
LOG_ERROR(@"Failed accepting socket: %s (%i)", strerror(errno), errno);
}
}
@@ -256,7 +256,7 @@ static void _NetServiceClientCallBack(CFNetServiceRef service, CFStreamError* er
struct sockaddr_in* sockaddr = (struct sockaddr_in*)&addr;
_port = ntohs(sockaddr->sin_port);
} else {
LOG_ERROR(@"Failed retrieving socket address (%i): %s", errno, strerror(errno));
LOG_ERROR(@"Failed retrieving socket address: %s (%i)", strerror(errno), errno);
}
} else {
_port = port;
@@ -278,15 +278,15 @@ static void _NetServiceClientCallBack(CFNetServiceRef service, CFStreamError* er
dispatch_resume(_source);
LOG_INFO(@"%@ started on port %i and reachable at %@", [self class], (int)_port, self.serverURL);
} else {
LOG_ERROR(@"Failed listening on socket (%i): %s", errno, strerror(errno));
LOG_ERROR(@"Failed listening on socket: %s (%i)", strerror(errno), errno);
close(listeningSocket);
}
} else {
LOG_ERROR(@"Failed binding socket (%i): %s", errno, strerror(errno));
LOG_ERROR(@"Failed binding socket: %s (%i)", strerror(errno), errno);
close(listeningSocket);
}
} else {
LOG_ERROR(@"Failed creating socket (%i): %s", errno, strerror(errno));
LOG_ERROR(@"Failed creating socket: %s (%i)", strerror(errno), errno);
}
return (_source ? YES : NO);
}

2
GCDWebServer/Core/GCDWebServerConnection.m
View File

@@ -626,7 +626,7 @@ static NSString* _StringFromAddressData(NSData* data) {
int result = close(_socket);
if (result != 0) {
LOG_ERROR(@"Failed closing socket %i for connection (%i): %s", _socket, errno, strerror(errno));
LOG_ERROR(@"Failed closing socket %i for connection: %s (%i)", _socket, strerror(errno), errno);
} else {
LOG_DEBUG(@"Did close connection on socket %i", _socket);
}