From: wessels <>
Date: Wed, 26 May 1999 12:48:06 +0000 (+0000)
Subject: rename SwapDir->obj.log to SwapDir->log.write
X-Git-Tag: SQUID_3_0_PRE1~2170
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=200ba06e00e791f70d48e0af573ed2ea84c69e8e;p=thirdparty%2Fsquid.git

rename SwapDir->obj.log to SwapDir->log.write
storeUfsFilenoBelongsHere() can be static
---

diff --git a/src/protos.h b/src/protos.h
index 9c4b564654..82bd69ba8d 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.333 1999/05/26 04:36:56 wessels Exp $
+ * $Id: protos.h,v 1.334 1999/05/26 06:48:06 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -938,7 +938,6 @@ extern void storeDirUpdateSwapSize(int fn, size_t size, int sign);
  * store_dir_ufs.c
  */
 extern OBJH storeUfsDirStats;
-extern int storeUfsFilenoBelongsHere(int, int, int, int);
 extern void storeUfsDirParse(cacheSwap * swap);
 extern void storeUfsDirDump(StoreEntry * entry, const char *name, SwapDir * s);
 extern void storeUfsDirFree(SwapDir *);
diff --git a/src/store_dir.cc b/src/store_dir.cc
index 25ae38df3e..2f8bb057f5 100644
--- a/src/store_dir.cc
+++ b/src/store_dir.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir.cc,v 1.96 1999/05/25 22:10:13 wessels Exp $
+ * $Id: store_dir.cc,v 1.97 1999/05/26 06:48:08 wessels Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -263,7 +263,7 @@ storeDirSwapLog(const StoreEntry * e, int op)
 	storeKeyText(e->key),
 	e->swap_file_number);
     sd = &Config.cacheSwap.swapDirs[dirn];
-    sd->obj.log(sd, e, op);
+    sd->log.write(sd, e, op);
 }
 
 void
diff --git a/src/structs.h b/src/structs.h
index 4a05111e03..1b70d1453f 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.293 1999/05/25 22:18:20 wessels Exp $
+ * $Id: structs.h,v 1.294 1999/05/26 06:48:10 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -1279,11 +1279,11 @@ struct _SwapDir {
 	STOBJREAD *read;
 	STOBJWRITE *write;
 	STOBJUNLINK *unlink;
-	STOBJLOG *log;
     } obj;
     struct {
 	STLOGOPEN *open;
 	STLOGCLOSE *close;
+	STLOGWRITE *write;
 	struct {
 	    STLOGCLEANOPEN *open;
 	    STLOGCLEANWRITE *write;
diff --git a/src/typedefs.h b/src/typedefs.h
index f4369a1e67..8a97baf641 100644
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: typedefs.h,v 1.93 1999/05/25 22:05:59 wessels Exp $
+ * $Id: typedefs.h,v 1.94 1999/05/26 06:48:11 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -218,9 +218,9 @@ typedef void STOBJCLOSE(storeIOState *);
 typedef void STOBJREAD(storeIOState *, char *, size_t, off_t, STRCB *, void *);
 typedef void STOBJWRITE(storeIOState *, char *, size_t, off_t, FREE *);
 typedef void STOBJUNLINK(sfileno);
-typedef void STOBJLOG(const SwapDir *, const StoreEntry *, int);
 typedef void STLOGOPEN(SwapDir *);
 typedef void STLOGCLOSE(SwapDir *);
+typedef void STLOGWRITE(const SwapDir *, const StoreEntry *, int);
 typedef int STLOGCLEANOPEN(SwapDir *);
 typedef void STLOGCLEANWRITE(const StoreEntry *, SwapDir *);