From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Mon, 20 Aug 2012 12:28:41 +0000 (+0200)
Subject: Moved carp prototypes to carp.h
X-Git-Tag: sourceformat-review-1~86
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=21c22f04dbdee5f8ee82b631ffd1f9fed3649697;p=thirdparty%2Fsquid.git

Moved carp prototypes to carp.h
---

diff --git a/src/Makefile.am b/src/Makefile.am
index a0f2f83048..b4f54fe018 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -268,6 +268,7 @@ squid_SOURCES = \
 	CacheDigest.cc \
 	cache_manager.cc \
 	CacheManager.h \
+	carp.h \
 	carp.cc \
 	cbdata.cc \
 	cbdata.h \
@@ -1308,6 +1309,7 @@ tests_testCacheManager_SOURCES = \
 	cache_cf.cc \
 	CacheDigest.h \
 	CacheDigest.cc \
+	carp.h \
 	carp.cc \
 	cbdata.cc \
 	ChunkedCodingParser.cc \
@@ -1648,6 +1650,7 @@ tests_testEvent_SOURCES = \
 	CacheDigest.cc \
 	cache_cf.cc \
 	cache_manager.cc \
+	carp.h \
 	carp.cc \
 	cbdata.cc \
 	ChunkedCodingParser.cc \
@@ -1852,6 +1855,7 @@ tests_testEventLoop_SOURCES = \
 	CacheDigest.cc \
 	cache_manager.cc \
 	cache_cf.cc \
+	carp.h \
 	carp.cc \
 	cbdata.cc \
 	ChunkedCodingParser.cc \
@@ -2054,6 +2058,7 @@ tests_test_http_range_SOURCES = \
 	cache_manager.cc \
 	CacheDigest.h \
 	CacheDigest.cc \
+	carp.h \
 	carp.cc \
 	cbdata.cc \
 	ChunkedCodingParser.cc \
@@ -2305,6 +2310,7 @@ tests_testHttpRequest_SOURCES = \
 	debug.cc \
 	CacheDigest.h \
 	CacheDigest.cc \
+	carp.h \
 	carp.cc \
 	cbdata.cc \
 	ChunkedCodingParser.cc \
@@ -3242,6 +3248,7 @@ tests_testURL_SOURCES = \
 	cache_manager.cc \
 	CacheDigest.h \
 	CacheDigest.cc \
+	carp.h \
 	carp.cc \
 	cbdata.cc \
 	ChunkedCodingParser.cc \
diff --git a/src/carp.h b/src/carp.h
new file mode 100644
index 0000000000..c3799cdf89
--- /dev/null
+++ b/src/carp.h
@@ -0,0 +1,43 @@
+/*
+ * DEBUG: section 39    Cache Array Routing Protocol
+ * AUTHOR: Henrik Nordstrom
+ *
+ * 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.
+ *
+ */
+
+
+#ifndef SQUID_CARP_H_
+#define SQUID_CARP_H_
+
+class peer;
+class HttpRequest;
+
+extern void carpInit(void);
+extern peer *carpSelectParent(HttpRequest *);
+
+#endif /* SQUID_CARP_H_ */
diff --git a/src/main.cc b/src/main.cc
index 460de93ef3..5a8c0c9ea4 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -39,6 +39,7 @@
 #include "base/RunnersRegistry.h"
 #include "base/Subscription.h"
 #include "base/TextException.h"
+#include "carp.h"
 #include "client_db.h"
 #include "comm.h"
 #include "ConfigParser.h"
diff --git a/src/peer_select.cc b/src/peer_select.cc
index f454c4d4f4..dd17008920 100644
--- a/src/peer_select.cc
+++ b/src/peer_select.cc
@@ -34,6 +34,7 @@
 
 #include "squid.h"
 #include "acl/FilledChecklist.h"
+#include "carp.h"
 #include "client_side.h"
 #include "DnsLookupDetails.h"
 #include "errorpage.h"
diff --git a/src/protos.h b/src/protos.h
index 19edeaa218..0d2422472c 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -469,9 +469,6 @@ SQUIDCEXTERN pid_t ipcCreate(int type,
                              void **hIpc);
 
 
-SQUIDCEXTERN void carpInit(void);
-SQUIDCEXTERN peer *carpSelectParent(HttpRequest *);
-
 /*
  * prototypes for system functions missing from system includes
  */