From c170fb4fd3c2d39f6fb8dafa66fdefb90b920e23 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Latour <pol@mac.com>
Date: Tue, 15 Apr 2014 23:34:04 -0300
Subject: [PATCH] Use strerror() consistently

---
 GCDWebServer/Core/GCDWebServer.m           | 12 ++++++------
 GCDWebServer/Core/GCDWebServerConnection.m |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/GCDWebServer/Core/GCDWebServer.m b/GCDWebServer/Core/GCDWebServer.m
index a324b88..aed38f9 100644
--- a/GCDWebServer/Core/GCDWebServer.m
+++ b/GCDWebServer/Core/GCDWebServer.m
@@ -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);
 }
diff --git a/GCDWebServer/Core/GCDWebServerConnection.m b/GCDWebServer/Core/GCDWebServerConnection.m
index 6e30bfc..7a69c28 100644
--- a/GCDWebServer/Core/GCDWebServerConnection.m
+++ b/GCDWebServer/Core/GCDWebServerConnection.m
@@ -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);
   }