Changeset 14:3caa1d3122db in xplcommon for src/xplcommon/posix/Acceptor.cc

Timestamp:

12/29/12 10:03:12 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Moved the storage of the error code to where it belongs

File:

• src/xplcommon/posix/Acceptor.cc (modified) (2 diffs)

src/xplcommon/posix/Acceptor.cc

@@ -34 +34 @@
 #include "ServerSocket.h"
 
-#include <cerrno>
-
 #include <poll.h>
 #include <sys/socket.h>
@@ -57 +55 @@
     if (acceptedFD>=0) return true;
 
-    socklen_t addrlen = addressLength;
-    int result = ::accept(socket.fd,
-                          reinterpret_cast<struct ::sockaddr*>(address),
-                          &addrlen);
+    size_t addrlen = addressLength;
+    int result = socket.accept(reinterpret_cast<struct ::sockaddr*>(address),
+                               (address==0) ? 0 : &addrlen);
     if (result<0) {
-        if (errno==EAGAIN || errno==EWOULDBLOCK) {
+        if (socket.failed()) {
+            socket.events &= ~POLLIN;
+        } else {
             socket.events |= POLLIN;
-        } else {
-            socket.events &= ~POLLIN;
-            setErrorCode(errno);
         }
         return false;