Moved redirect.cc-related prototype to newly-created redirect.h

diff --git a/src/Makefile.am b/src/Makefile.am
index e13f692516f3cff791847cbbcc3f8518beccffe3..de62cd7ad1e094347dfc6d6bded58699c38f04fa 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -437,6 +437,7 @@ squid_SOURCES = \
        PeerSelectState.h \
        PingData.h \
        protos.h \
+       redirect.h \
        redirect.cc \
        refresh.h \
        refresh.cc \
@@ -1441,6 +1442,7 @@ tests_testCacheManager_SOURCES = \
        peer_sourcehash.cc \
        peer_userhash.h \
        peer_userhash.cc \
+       redirect.h \
        redirect.cc \
        refresh.h \
        refresh.cc \
@@ -1819,6 +1821,7 @@ tests_testEvent_SOURCES = \
        peer_sourcehash.cc \
        peer_userhash.h \
        peer_userhash.cc \
+       redirect.h \
        redirect.cc \
        refresh.h \
        refresh.cc \
@@ -2042,6 +2045,7 @@ tests_testEventLoop_SOURCES = \
        peer_userhash.h \
        peer_userhash.cc \
        RemovalPolicy.cc \
+       redirect.h \
        redirect.cc \
        refresh.h \
        refresh.cc \
@@ -2260,6 +2264,7 @@ tests_test_http_range_SOURCES = \
        peer_userhash.h \
        peer_userhash.cc \
        pconn.cc \
+       redirect.h \
        redirect.cc \
        refresh.h \
        refresh.cc \
@@ -2521,6 +2526,7 @@ tests_testHttpRequest_SOURCES = \
        peer_sourcehash.cc \
        peer_userhash.h \
        peer_userhash.cc \
+       redirect.h \
        redirect.cc \
        refresh.h \
        refresh.cc \
@@ -3540,6 +3546,7 @@ tests_testURL_SOURCES = \
        peer_sourcehash.cc \
        peer_userhash.h \
        peer_userhash.cc \
+       redirect.h \
        redirect.cc \
        refresh.h \
        refresh.cc \

diff --git a/src/main.cc b/src/main.cc
index 9e1c474d4bb501412c8bda0359eb9da0d3979b35..3ab2cf4c3e1b2e67ccff365ffbc7a18041bad97a 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -79,6 +79,7 @@
 #include "peer_userhash.h"
 #include "profiler/Profiler.h"
 #include "protos.h"
+#include "redirect.h"
 #include "refresh.h"
 #include "tools.h"
 #include "SquidDns.h"

diff --git a/src/protos.h b/src/protos.h
index c8bc357a75312b69b281b4944f1f3ac4a980af00..0ca3cded42c00bc8f73878748ea8bcf0b8edb858 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -82,9 +82,6 @@ extern variable_list *snmp_meshCtblFn(variable_list *, snint *);
 
 #include "comm/forward.h"
 
-SQUIDCEXTERN void redirectInit(void);
-SQUIDCEXTERN void redirectShutdown(void);
-
 extern void shut_down(int);
 extern void rotate_logs(int);
 extern void reconfigure(int);

diff --git a/src/redirect.cc b/src/redirect.cc
index 621a8ee0f7b6627f215fee5401d45b104600ba94..b219a6bc5fc252b89d85bd7c2e15188ec0fb3898 100644 (file)
--- a/src/redirect.cc
+++ b/src/redirect.cc
@@ -1,7 +1,4 @@
-
 /*
- * $Id$
- *
  * DEBUG: section 61    Redirector
  * AUTHOR: Duane Wessels
  *
@@ -46,6 +43,7 @@
 #include "helper.h"
 #include "mgr/Registration.h"
 #include "protos.h"
+#include "redirect.h"
 #include "rfc1738.h"
 #include "Store.h"
 #if USE_AUTH

diff --git a/src/redirect.h b/src/redirect.h
new file mode 100644 (file)
index 0000000..dd74a03
--- /dev/null
+++ b/src/redirect.h
@@ -0,0 +1,39 @@
+#ifndef SQUID_REDIRECT_H_
+#define SQUID_REDIRECT_H_
+
+/*
+ * DEBUG: section 61    Redirector
+ * 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.
+ *
+ */
+
+extern void redirectInit(void);
+extern void redirectShutdown(void);
+
+#endif /* SQUID_REDIRECT_H_ */