From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Thu, 30 Aug 2012 08:41:13 +0000 (+0200)
Subject: Moved some prototypes to new store_swapin.h
X-Git-Tag: sourceformat-review-1~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f82b5c647c28db0d3b14c0b78b730ec7c921f840;p=thirdparty%2Fsquid.git

Moved some prototypes to new store_swapin.h
---

diff --git a/src/Makefile.am b/src/Makefile.am
index a4686456f2..6945aabcb9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -482,6 +482,7 @@ squid_SOURCES = \
 	store_log.cc \
 	store_rebuild.h \
 	store_rebuild.cc \
+	store_swapin.h \
 	store_swapin.cc \
 	store_swapmeta.cc \
 	store_swapout.cc \
@@ -1481,6 +1482,7 @@ tests_testCacheManager_SOURCES = \
 	store_log.cc \
 	store_rebuild.h \
 	store_rebuild.cc \
+	store_swapin.h \
 	store_swapin.cc \
 	store_swapmeta.cc \
 	store_swapout.cc \
@@ -1866,6 +1868,7 @@ tests_testEvent_SOURCES = \
 	store_log.cc \
 	store_rebuild.h \
 	store_rebuild.cc \
+	store_swapin.h \
 	store_swapin.cc \
 	store_swapmeta.cc \
 	store_swapout.cc \
@@ -2092,6 +2095,7 @@ tests_testEventLoop_SOURCES = \
 	store_log.cc \
 	store_rebuild.h \
 	store_rebuild.cc \
+	store_swapin.h \
 	store_swapin.cc \
 	store_swapmeta.cc \
 	store_swapout.cc \
@@ -2315,6 +2319,7 @@ tests_test_http_range_SOURCES = \
 	store_log.cc \
 	store_rebuild.h \
 	store_rebuild.cc \
+	store_swapin.h \
 	store_swapin.cc \
 	store_swapmeta.cc \
 	store_swapout.cc \
@@ -2581,6 +2586,7 @@ tests_testHttpRequest_SOURCES = \
 	store_log.cc \
 	store_rebuild.h \
 	store_rebuild.cc \
+	store_swapin.h \
 	store_swapin.cc \
 	store_swapmeta.cc \
 	store_swapout.cc \
@@ -3615,6 +3621,7 @@ tests_testURL_SOURCES = \
 	store_log.cc \
 	store_rebuild.h \
 	store_rebuild.cc \
+	store_swapin.h \
 	store_swapin.cc \
 	store_swapmeta.cc \
 	store_swapout.cc \
diff --git a/src/protos.h b/src/protos.h
index 4b19dfd71d..68d507dc2b 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -86,14 +86,7 @@ extern void shut_down(int);
 extern void rotate_logs(int);
 extern void reconfigure(int);
 
-
-
-/*
- * store_swapin.c
- */
 class store_client;
-extern void storeSwapInStart(store_client *);
-
 /*
  * store_client.c
  */
diff --git a/src/store_client.cc b/src/store_client.cc
index ddb83428f9..5e7fec3fe2 100644
--- a/src/store_client.cc
+++ b/src/store_client.cc
@@ -46,6 +46,7 @@
 #include "StatCounters.h"
 #include "StoreClient.h"
 #include "Store.h"
+#include "store_swapin.h"
 #include "StoreMeta.h"
 #include "StoreMetaUnpacker.h"
 #if USE_DELAY_POOLS
diff --git a/src/store_swapin.cc b/src/store_swapin.cc
index 26f62b65a4..da4cab3427 100644
--- a/src/store_swapin.cc
+++ b/src/store_swapin.cc
@@ -1,7 +1,4 @@
-
 /*
- * $Id$
- *
  * DEBUG: section 20    Storage Manager Swapin Functions
  * AUTHOR: Duane Wessels
  *
@@ -38,6 +35,7 @@
 #include "StatCounters.h"
 #include "StoreClient.h"
 #include "Store.h"
+#include "store_swapin.h"
 
 static StoreIOState::STIOCB storeSwapInFileClosed;
 static StoreIOState::STFNCB storeSwapInFileNotify;
diff --git a/src/store_swapin.h b/src/store_swapin.h
new file mode 100644
index 0000000000..1044971700
--- /dev/null
+++ b/src/store_swapin.h
@@ -0,0 +1,38 @@
+#ifndef SQUID_STORE_SWAPIN_H_
+#define SQUID_STORE_SWAPIN_H_
+/*
+ * DEBUG: section 20    Storage Manager Swapin 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 store_client;
+extern void storeSwapInStart(store_client *);
+
+#endif /* SQUID_STORE_SWAPIN_H_ */