Changeset 22:d13fbc745959 in xplcommon for src/xplcommon/win32/LocalAcceptor.cc

Timestamp:

01/02/13 06:43:16 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Cleaned up and simplified the code

File:

• src/xplcommon/win32/LocalAcceptor.cc (modified) (3 diffs)

src/xplcommon/win32/LocalAcceptor.cc

@@ -43 +43 @@
     accepted(false)
 {
-    LocalSocket::setupName(this->name, name);
+    LocalSocket::setupPath(path, name);
 }
 
@@ -50 +50 @@
 bool LocalAcceptor::accept()
 {
+    if (failed()) return false;
     if (accepted) return true;
 
-    if (isWaited()) {
-        DWORD size = 0;
-        if (getResult(size, socket.handle)) {
-            removeFromWaiter();
-            accepted = true;
-            return true;
-        } else {
-            if (socket.failed()) {
-                removeFromWaiter();
-            }
-            return false;
-        }
+    bool result = false;
+    if (checkWaitedResult(result)) {
+        return result;
     }
 
-
-    if (!socket.createNamedPipe(name)) {
+    if (!socket.createNamedPipe(path)) {
         return false;
     }
 
-    bool result = socket.connectNamedPipe(overlapped);
+    result = socket.connectNamedPipe(overlapped);
     if (result) {
         accepted = true;
@@ -83 +74 @@
 //------------------------------------------------------------------------------
 
+void LocalAcceptor::handleWaitedResult(DWORD /*size*/)
+{
+    accepted = true;
+}
+
+//------------------------------------------------------------------------------
+
 // Local Variables:
 // mode: C++