---------------------
PatchSet 5966 
Date: 2007/10/15 10:06:47
Author: amosjeffries
Branch: docs
Tag: (none) 
Log:
BlockingFile got converted the wrong way on previous commit.

Members: 
	src/DiskIO/Blocking/BlockingFile.cc:1.4.2.1->1.4.2.2 
	src/DiskIO/Blocking/BlockingFile.h:1.2.14.2->1.2.14.3 

Index: squid3/src/DiskIO/Blocking/BlockingFile.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/DiskIO/Blocking/BlockingFile.cc,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- squid3/src/DiskIO/Blocking/BlockingFile.cc	5 Oct 2007 06:32:54 -0000	1.4.2.1
+++ squid3/src/DiskIO/Blocking/BlockingFile.cc	15 Oct 2007 10:06:47 -0000	1.4.2.2
@@ -1,6 +1,5 @@
-
 /*
- * $Id: BlockingFile.cc,v 1.4.2.1 2007/10/05 06:32:54 amosjeffries Exp $
+ * $Id: BlockingFile.cc,v 1.4.2.2 2007/10/15 10:06:47 amosjeffries Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Robert Collins
@@ -72,7 +71,7 @@
 }
 
 void
-BlockingFile::open(int flags, mode_t mode, IORequestor::Pointer callback)
+BlockingFile::open(int flags, mode_t mode, RefCount<IORequestor> callback)
 {
     /* Simulate async calls */
     fd = file_open(path_ , flags);
@@ -92,10 +91,10 @@
 
 /**
  * Alias for BlockingFile::open(...)
- \copydoc BlockingFile::open(int flags, mode_t mode, IORequestor::Pointer callback)
+ \copydoc BlockingFile::open(int flags, mode_t mode, RefCount<IORequestor> callback)
  */
 void
-BlockingFile::create(int flags, mode_t mode, IORequestor::Pointer callback)
+BlockingFile::create(int flags, mode_t mode, RefCount<IORequestor> callback)
 {
     /* We use the same logic path for open */
     open(flags, mode, callback);
@@ -113,7 +112,7 @@
 }
 
 void
-BlockingFile::close ()
+BlockingFile::close()
 {
     debugs(79, 3, "BlockingFile::close: " << this << " closing for " << ioRequestor.getRaw());
     doClose();
@@ -173,9 +172,9 @@
 }
 
 bool
-BlockingFile::ioInProgress()const
+BlockingFile::ioInProgress() const
 {
-    /* IO is never pending with UFS */
+    /** \retval false   IO is never pending with UFS */
     return false;
 }
 
Index: squid3/src/DiskIO/Blocking/BlockingFile.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/DiskIO/Blocking/BlockingFile.h,v
retrieving revision 1.2.14.2
retrieving revision 1.2.14.3
diff -u -r1.2.14.2 -r1.2.14.3
--- squid3/src/DiskIO/Blocking/BlockingFile.h	15 Oct 2007 09:16:43 -0000	1.2.14.2
+++ squid3/src/DiskIO/Blocking/BlockingFile.h	15 Oct 2007 10:06:48 -0000	1.2.14.3
@@ -1,5 +1,5 @@
 /*
- * $Id: BlockingFile.h,v 1.2.14.2 2007/10/15 09:16:43 amosjeffries Exp $
+ * $Id: BlockingFile.h,v 1.2.14.3 2007/10/15 10:06:48 amosjeffries Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Robert Collins
@@ -48,8 +48,8 @@
     void operator delete(void *);
     BlockingFile(char const *path);
     ~BlockingFile();
-    virtual void open(int flags, mode_t mode, IORequestor::Pointer callback);
-    virtual void create(int flags, mode_t mode, IORequestor::Pointer callback);
+    virtual void open(int flags, mode_t mode, RefCount<IORequestor> callback);
+    virtual void create(int flags, mode_t mode, RefCount<IORequestor> callback);
     virtual void read(ReadRequest *);
     virtual void write(WriteRequest *);
     virtual void close();