From: wessels <>
Date: Wed, 24 May 2006 21:25:04 +0000 (+0000)
Subject: cosmetic change: rename doCallback to doCloseCallback to clarify
X-Git-Tag: SQUID_3_0_PRE4~92
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e2cded3a0a4aa8daed6357f8ced861b00b10de5;p=thirdparty%2Fsquid.git

cosmetic change: rename doCallback to doCloseCallback to clarify
what this function does.
---

diff --git a/src/fs/ufs/store_io_ufs.cc b/src/fs/ufs/store_io_ufs.cc
index 2c3f32bb4d..17f82d92bf 100644
--- a/src/fs/ufs/store_io_ufs.cc
+++ b/src/fs/ufs/store_io_ufs.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_io_ufs.cc,v 1.32 2006/05/23 00:30:21 wessels Exp $
+ * $Id: store_io_ufs.cc,v 1.33 2006/05/24 15:25:04 wessels Exp $
  *
  * DEBUG: section 79    Storage Manager UFS Interface
  * AUTHOR: Duane Wessels
@@ -124,14 +124,14 @@ UFSStoreState::ioCompletedNotification()
     debug(79, 3) ("diskd::ioCompleted: dirno %d, fileno %08x status %d\n",                      swap_dirn, swap_filen, theFile->error());
     /* Ok, notification past open means an error has occured */
     assert (theFile->error());
-    doCallback(DISK_ERROR);
+    doCloseCallback(DISK_ERROR);
 }
 
 void
 UFSStoreState::openDone()
 {
     if (theFile->error()) {
-        doCallback(DISK_ERROR);
+        doCloseCallback(DISK_ERROR);
         return;
     }
 
@@ -144,7 +144,7 @@ UFSStoreState::openDone()
     }
 
     if (closing && !theFile->ioInProgress())
-        doCallback(theFile->error() ? -1 : 0);
+        doCloseCallback(theFile->error() ? -1 : 0);
 
     debug(79, 3) ("squidaiostate_t::openDone: exiting\n");
 }
@@ -157,9 +157,9 @@ UFSStoreState::closeCompleted()
                   swap_dirn, swap_filen, theFile->error());
 
     if (theFile->error())
-        doCallback(DISK_ERROR);
+        doCloseCallback(DISK_ERROR);
     else
-        doCallback(DISK_OK);
+        doCloseCallback(DISK_OK);
 
     closing = false;
 }
@@ -253,7 +253,7 @@ UFSStoreState::readCompleted(const char *buf, int len, int errflag, RefCount<Rea
 
         callback(cbdata, read_buf, len, this);
     } else if (closing && theFile.getRaw()!= NULL && !theFile->ioInProgress())
-        doCallback(errflag);
+        doCloseCallback(errflag);
 }
 
 void
@@ -266,7 +266,7 @@ UFSStoreState::writeCompleted(int errflag, size_t len, RefCount<WriteRequest> wr
     offset_ += len;
 
     if (theFile->error()) {
-        doCallback(DISK_ERROR);
+        doCloseCallback(DISK_ERROR);
         return;
     }
 
@@ -285,12 +285,12 @@ UFSStoreState::writeCompleted(int errflag, size_t len, RefCount<WriteRequest> wr
         flags.write_kicking = false;
 
         if (!theFile->ioInProgress() && closing)
-            doCallback(errflag);
+            doCloseCallback(errflag);
     }
 }
 
 void
-UFSStoreState::doCallback(int errflag)
+UFSStoreState::doCloseCallback(int errflag)
 {
     debug(79, 3) ("storeUfsIOCallback: errflag=%d\n", errflag);
     STIOCB *theCallback = callback;
diff --git a/src/fs/ufs/ufscommon.h b/src/fs/ufs/ufscommon.h
index 4a9777e9a1..6d62bfaa3f 100644
--- a/src/fs/ufs/ufscommon.h
+++ b/src/fs/ufs/ufscommon.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ufscommon.h,v 1.5 2006/05/23 00:21:48 wessels Exp $
+ * $Id: ufscommon.h,v 1.6 2006/05/24 15:25:04 wessels Exp $
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
@@ -220,7 +220,7 @@ public:
     void write(char const *buf, size_t size, off_t offset, FREE * free_func);
 
 protected:
-    virtual void doCallback (int errflag);
+    virtual void doCloseCallback (int errflag);
 
     class _queued_read
     {