Merged from parent (trunk r10600).

[thirdparty/squid.git] / src / comm / ListenStateData.cc

diff --git a/src/comm/ListenStateData.cc b/src/comm/ListenStateData.cc
index 8f6e481d4f903ade8a0c09d309c94c5472e0739d..4e5a304831b5c74806dde63863c3f5ada73f5b95 100644 (file)
--- a/src/comm/ListenStateData.cc
+++ b/src/comm/ListenStateData.cc
@@ -1,5 +1,5 @@
 /*
- * DEBUG: section 5     Listener Socket Handler
+ * DEBUG: section 05    Listener Socket Handler
  * AUTHOR: Harvest Derived
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -141,7 +141,7 @@ Comm::ListenStateData::okToAccept()
     return false;
 }
 
-bool
+void
 Comm::ListenStateData::acceptOne()
 {
     /*
@@ -159,22 +159,22 @@ Comm::ListenStateData::acceptOne()
 
         if (newfd == COMM_NOMESSAGE) {
             /* register interest again */
-            debugs(5, 5, HERE << "try later: FD " << fd << " handler: " << *theCallback);
+            debugs(5, 5, HERE << "try later: FD " << fd << " handler: " << theCallback);
             commSetSelect(fd, COMM_SELECT_READ, doAccept, this, 0);
-            return false;
+            return;
         }
 
         // A non-recoverable error; notify the caller */
-        debugs(5, 5, HERE << "non-recoverable error: FD " << fd << " handler: " << *theCallback);
+        debugs(5, 5, HERE << "non-recoverable error: FD " << fd << " handler: " << theCallback);
         notify(-1, COMM_ERROR, errno, connDetails);
-        return false;
+        mayAcceptMore = false;
+        return;
     }
 
     debugs(5, 5, HERE << "accepted: FD " << fd <<
            " newfd: " << newfd << " from: " << connDetails.peer <<
-           " handler: " << *theCallback);
+           " handler: " << theCallback);
     notify(newfd, COMM_OK, 0, connDetails);
-    return true;
 }
 
 void
@@ -182,7 +182,7 @@ Comm::ListenStateData::acceptNext()
 {
     assert(isOpen(fd));
     debugs(5, 2, HERE << "connection on FD " << fd);
-    mayAcceptMore = acceptOne();
+    acceptOne();
 }
 
 void