SourceFormat Enforcement

[thirdparty/squid.git] / src / CommRead.h

diff --git a/src/CommRead.h b/src/CommRead.h
index 1c0f6fc3356401d49f92f98fe9782d18b09f7424..760492c70af361dfa824024b52daeea60fa4be6c 100644 (file)
--- a/src/CommRead.h
+++ b/src/CommRead.h
@@ -36,18 +36,18 @@
 #ifndef COMMREAD_H
 #define COMMREAD_H
 
-#include "squid.h"
 #include "comm.h"
 #include "CommCalls.h"
+#include "comm/forward.h"
 #include "CbDataList.h"
 
 class CommRead
 {
 
 public:
-    CommRead ();
-    CommRead (int fd, char *buf, int len, AsyncCall::Pointer &callback);
-    int fd;
+    CommRead();
+    CommRead(const Comm::ConnectionPointer &c, char *buf, int len, AsyncCall::Pointer &callback);
+    Comm::ConnectionPointer conn;
     char *buf;
     int len;
     AsyncCall::Pointer callback;
@@ -79,12 +79,11 @@ public:
     void kickReads(int const count);
 
 private:
-    static PF CloseHandler;
+    static CLCB CloseHandler;
     static DeferredRead popHead(CbDataListContainer<DeferredRead> &deferredReads);
     void kickARead(DeferredRead const &);
     void flushReads();
     CbDataListContainer<DeferredRead> deferredReads;
 };
 
-
 #endif /* COMMREAD_H */