------------------------------------------------------------
revno: 13448
revision-id: squid3@treenet.co.nz-20140605160541-mmaadq1kc8kaez2j
parent: squid3@treenet.co.nz-20140605155723-kmh7gu9huoxjg060
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Thu 2014-06-05 09:05:41 -0700
message:
  Some flags missed in rev.13445
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20140605160541-mmaadq1kc8kaez2j
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: b5811cc1c61903a234f4d918fea5face04e5b28a
# timestamp: 2014-06-05 16:54:26 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20140605155723-\
#   kmh7gu9huoxjg060
# 
# Begin patch
=== modified file 'src/adaptation/icap/Xaction.cc'
--- src/adaptation/icap/Xaction.cc	2014-06-05 09:32:50 +0000
+++ src/adaptation/icap/Xaction.cc	2014-06-05 16:05:41 +0000
@@ -120,7 +120,7 @@
         CbcPointer<Xaction> self(this);
         Dialer dialer(self, &Adaptation::Icap::Xaction::noteCommConnected);
         dialer.params.conn = connection;
-        dialer.params.flag = COMM_OK;
+        dialer.params.flag = Comm::OK;
         // fake other parameters by copying from the existing connection
         connector = asyncCall(93,3, "Adaptation::Icap::Xaction::noteCommConnected", dialer);
         ScheduleCallHere(connector);
@@ -152,7 +152,7 @@
         CbcPointer<Xaction> self(this);
         Dialer dialer(self, &Adaptation::Icap::Xaction::noteCommConnected);
         dialer.params.conn = connection;
-        dialer.params.flag = COMM_ERROR;
+        dialer.params.flag = Comm::ERROR;
         // fake other parameters by copying from the existing connection
         connector = asyncCall(93,3, "Adaptation::Icap::Xaction::noteCommConnected", dialer);
         ScheduleCallHere(connector);
@@ -185,7 +185,7 @@
 {
     debugs(93, 5, HERE << "reused connection");
     Adaptation::Icap::Xaction *x = (Adaptation::Icap::Xaction*)data;
-    x->noteCommConnected(COMM_OK);
+    x->noteCommConnected(Comm::OK);
 }
 #endif
 
@@ -227,7 +227,7 @@
 {
     cs = NULL;
 
-    if (io.flag == COMM_TIMEOUT) {
+    if (io.flag == Comm::TIMEOUT) {
         handleCommTimedout();
         return;
     }
@@ -235,7 +235,7 @@
     Must(connector != NULL);
     connector = NULL;
 
-    if (io.flag != COMM_OK)
+    if (io.flag != Comm::OK)
         dieOnConnectionFailure(); // throws
 
     typedef CommCbMemFunT<Adaptation::Icap::Xaction, CommTimeoutCbParams> TimeoutDialer;
@@ -286,7 +286,7 @@
         ignoreLastWrite = false;
         debugs(93, 7, HERE << "ignoring last write; status: " << io.flag);
     } else {
-        Must(io.flag == COMM_OK);
+        Must(io.flag == Comm::OK);
         al.icap.bytesSent += io.size;
         updateTimeout();
         handleCommWrote(io.size);
@@ -392,7 +392,7 @@
     Must(reader != NULL);
     reader = NULL;
 
-    Must(io.flag == COMM_OK);
+    Must(io.flag == Comm::OK);
 
     if (!io.size) {
         commEof = true;

=== modified file 'src/comm/ModPoll.cc'
--- src/comm/ModPoll.cc	2014-06-05 14:57:58 +0000
+++ src/comm/ModPoll.cc	2014-06-05 16:05:41 +0000
@@ -423,9 +423,9 @@
          */
         if (nfds == 0 && npending == 0) {
             if (shutting_down)
-                return COMM_SHUTDOWN;
+                return Comm::SHUTDOWN;
             else
-                return COMM_IDLE;
+                return Comm::IDLE;
         }
 
         for (;;) {

=== modified file 'src/comm/ModSelect.cc'
--- src/comm/ModSelect.cc	2014-06-05 14:57:58 +0000
+++ src/comm/ModSelect.cc	2014-06-05 16:05:41 +0000
@@ -440,7 +440,7 @@
 #endif
         if (nreadfds + nwritefds == 0) {
             assert(shutting_down);
-            return COMM_SHUTDOWN;
+            return Comm::SHUTDOWN;
         }
 
         if (msec > MAX_POLL_TIME)

=== modified file 'src/comm/ModSelectWin32.cc'
--- src/comm/ModSelectWin32.cc	2014-06-05 14:57:58 +0000
+++ src/comm/ModSelectWin32.cc	2014-06-05 16:05:41 +0000
@@ -434,7 +434,7 @@
 #endif
         if (nreadfds + nwritefds == 0) {
             assert(shutting_down);
-            return COMM_SHUTDOWN;
+            return Comm::SHUTDOWN;
         }
 
         if (msec > MAX_POLL_TIME)