---------------------
PatchSet 324 
Date: 2002/12/12 02:15:23
Author: rbcollins
Branch: unify-io
Tag: (none) 
Log:
remove diskd's read_, it's now obsolete

Members: 
	src/fs/diskd/store_diskd.h:1.1.20.28->1.1.20.29 
	src/fs/diskd/store_io_diskd.cc:1.1.20.34->1.1.20.35 

Index: squid3/src/fs/diskd/store_diskd.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/fs/diskd/Attic/store_diskd.h,v
retrieving revision 1.1.20.28
retrieving revision 1.1.20.29
diff -u -r1.1.20.28 -r1.1.20.29
--- squid3/src/fs/diskd/store_diskd.h	12 Dec 2002 02:11:32 -0000	1.1.20.28
+++ squid3/src/fs/diskd/store_diskd.h	12 Dec 2002 02:15:23 -0000	1.1.20.29
@@ -74,7 +74,6 @@
     void ioCompletedNotification();
     void readCompleted(const char *buf, int len, int errflag);
     void closeCompleted();
-    void read_(char *buf, size_t size, off_t offset, STRCB * callback, void *callback_data);
     void write(char *buf, size_t size, off_t offset, FREE * free_func);
   private:
     CBDATA_CLASS(diskdstate_t);
Index: squid3/src/fs/diskd/store_io_diskd.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/fs/diskd/Attic/store_io_diskd.cc,v
retrieving revision 1.1.20.34
retrieving revision 1.1.20.35
diff -u -r1.1.20.34 -r1.1.20.35
--- squid3/src/fs/diskd/store_io_diskd.cc	12 Dec 2002 00:52:37 -0000	1.1.20.34
+++ squid3/src/fs/diskd/store_io_diskd.cc	12 Dec 2002 02:15:23 -0000	1.1.20.35
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_io_diskd.cc,v 1.1.20.34 2002/12/12 00:52:37 rbcollins Exp $
+ * $Id: store_io_diskd.cc,v 1.1.20.35 2002/12/12 02:15:23 rbcollins Exp $
  *
  * DEBUG: section 79    Squid-side DISKD I/O functions.
  * AUTHOR: Duane Wessels
@@ -482,23 +482,6 @@
 }
 
 void
-diskdstate_t::read_(char *buf, size_t size, off_t offset, STRCB * aCallback, void *aCallback_data)
-{
-    debug(79, 3) ("storeDiskdRead: dirno %d, fileno %08X\n", swap_dirn, swap_filen);
-    assert(!closing);
-    assert(!reading);
-    assert(read.callback == NULL);
-    assert(read.callback_data == NULL);
-    assert(aCallback);
-    read.callback = aCallback;
-    read.callback_data = cbdataReference(aCallback_data);
-    read_buf = buf;	/* the one passed from above */
-    offset_ = offset;
-    reading = true;
-    theFile->read(buf, offset, size);
-}
-
-void
 diskdstate_t::write(char *buf, size_t size, off_t offset, FREE * free_func)
 {
     SwapDir *SD = INDEXSD(swap_dirn);