Moved store_log prototypes to newly-created store_log.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 7793c90956e7ef37e6ee28183cdeafdca2b64d34..e1e2071f3362cba8d8b5804cd78d3c87449480e4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -477,6 +477,7 @@ squid_SOURCES = \
        store_dir.cc \
        store_key_md5.h \
        store_key_md5.cc \
+       store_log.h \
        store_log.cc \
        store_rebuild.cc \
        store_swapin.cc \
@@ -1472,6 +1473,7 @@ tests_testCacheManager_SOURCES = \
        store_io.cc \
        store_key_md5.h \
        store_key_md5.cc \
+       store_log.h \
        store_log.cc \
        store_rebuild.cc \
        store_swapin.cc \
@@ -1853,6 +1855,7 @@ tests_testEvent_SOURCES = \
        store_io.cc \
        store_key_md5.h \
        store_key_md5.cc \
+       store_log.h \
        store_log.cc \
        store_rebuild.cc \
        store_swapin.cc \
@@ -2076,6 +2079,7 @@ tests_testEventLoop_SOURCES = \
        store_io.cc \
        store_key_md5.h \
        store_key_md5.cc \
+       store_log.h \
        store_log.cc \
        store_rebuild.cc \
        store_swapin.cc \
@@ -2296,6 +2300,7 @@ tests_test_http_range_SOURCES = \
        store_key_md5.h \
        store_key_md5.cc \
        store_io.cc \
+       store_log.h \
        store_log.cc \
        store_rebuild.cc \
        store_swapin.cc \
@@ -2559,6 +2564,7 @@ tests_testHttpRequest_SOURCES = \
        store_io.cc \
        store_key_md5.h \
        store_key_md5.cc \
+       store_log.h \
        store_log.cc \
        store_rebuild.cc \
        store_swapin.cc \
@@ -3585,6 +3591,7 @@ tests_testURL_SOURCES = \
        store_io.cc \
        store_key_md5.h \
        store_key_md5.cc \
+       store_log.h \
        store_log.cc \
        store_rebuild.cc \
        store_swapin.cc \

diff --git a/src/main.cc b/src/main.cc
index 8b7dbaa91e0362da62bef6993dc5e4fb254176fe..5c11a4d7e901c6c714f88f64b0b04a4a3cde3fab 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -82,6 +82,7 @@
 #include "redirect.h"
 #include "refresh.h"
 #include "send-announce.h"
+#include "store_log.h"
 #include "tools.h"
 #include "SquidDns.h"
 #include "SquidTime.h"

diff --git a/src/protos.h b/src/protos.h
index 2d2e1abd3da901f668f31c73b11051068709f2b4..bea93fb13a6f78d92f41322a292250550a0a1589 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -86,14 +86,6 @@ extern void shut_down(int);
 extern void rotate_logs(int);
 extern void reconfigure(int);
 
-/*
- * store_log.c
- */
-extern void storeLog(int tag, const StoreEntry * e);
-extern void storeLogRotate(void);
-extern void storeLogClose(void);
-extern void storeLogOpen(void);
-
 /*
  * store_digest.c
  */

diff --git a/src/store.cc b/src/store.cc
index a35a0f5a16245c92da0b57ede221ae77ab6776c4..6d6845a6a4a2c3a901448553dfc16ccebb23438e 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -61,6 +61,7 @@
 #include "StoreMeta.h"
 #include "StrList.h"
 #include "store_key_md5.h"
+#include "store_log.h"
 #include "SwapDir.h"
 #include "swap_log_op.h"
 #if USE_DELAY_POOLS

diff --git a/src/store_log.cc b/src/store_log.cc
index 91688b7f4c496bd598ccefbff730493373a204c2..093040a029a805cae9b5d877a37643252b5fb6e8 100644 (file)
--- a/src/store_log.cc
+++ b/src/store_log.cc
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * DEBUG: section 20    Storage Manager Logging Functions
  * AUTHOR: Duane Wessels
  *
@@ -39,6 +37,7 @@
 #include "MemObject.h"
 #include "mgr/Registration.h"
 #include "Store.h"
+#include "store_log.h"
 #include "SquidTime.h"
 
 static const char *storeLogTags[] = {

diff --git a/src/store_log.h b/src/store_log.h
new file mode 100644 (file)
index 0000000..d99786e
--- /dev/null
+++ b/src/store_log.h
@@ -0,0 +1,42 @@
+#ifndef SQUID_STORE_LOG_H_
+#define SQUID_STORE_LOG_H_
+/*
+ * DEBUG: section 20    Storage Manager Logging Functions
+ * AUTHOR: Duane Wessels
+ *
+ * SQUID Web Proxy Cache          http://www.squid-cache.org/
+ * ----------------------------------------------------------
+ *
+ *  Squid is the result of efforts by numerous individuals from
+ *  the Internet community; see the CONTRIBUTORS file for full
+ *  details.   Many organizations have provided support for Squid's
+ *  development; see the SPONSORS file for full details.  Squid is
+ *  Copyrighted (C) 2001 by the Regents of the University of
+ *  California; see the COPYRIGHT file for full details.  Squid
+ *  incorporates software developed and/or copyrighted by other
+ *  sources; see the CREDITS file for full details.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ *
+ */
+
+class StoreEntry;
+
+extern void storeLog(int tag, const StoreEntry * e);
+extern void storeLogRotate(void);
+extern void storeLogClose(void);
+extern void storeLogOpen(void);
+
+#endif /* SQUID_STORE_LOG_H_ */

diff --git a/src/store_swapout.cc b/src/store_swapout.cc
index 51eea6ed568ecb57a00e1e93eddd082b66801d33..2c61ba74570135797270998f40e99f65a7c81338 100644 (file)
--- a/src/store_swapout.cc
+++ b/src/store_swapout.cc
@@ -43,6 +43,7 @@
 #include "protos.h"
 #include "SwapDir.h"
 #include "StatCounters.h"
+#include "store_log.h"
 #include "swap_log_op.h"
 
 static void storeSwapOutStart(StoreEntry * e);