Moved ftp.cc-related prototypes to new ftp.h

diff --git a/src/Makefile.am b/src/Makefile.am
index c3fa6f7072f1f744b8ee9f37d530a6ff39875a02..ee5c434f1bbe52696d88cbaad830d1b3699af667 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -340,6 +340,7 @@ squid_SOURCES = \
        forward.h \
        fqdncache.h \
        fqdncache.cc \
+       ftp.h \
        ftp.cc \
        Generic.h \
        globals.h \
@@ -1370,6 +1371,7 @@ tests_testCacheManager_SOURCES = \
        forward.cc \
        fqdncache.h \
        fqdncache.cc \
+       ftp.h \
        ftp.cc \
        gopher.h \
        gopher.cc \
@@ -1729,6 +1731,7 @@ tests_testEvent_SOURCES = \
        forward.cc \
        fqdncache.h \
        fqdncache.cc \
+       ftp.h \
        ftp.cc \
        gopher.h \
        gopher.cc \
@@ -1942,6 +1945,7 @@ tests_testEventLoop_SOURCES = \
        forward.cc \
        fqdncache.h \
        fqdncache.cc \
+       ftp.h \
        ftp.cc \
        gopher.h \
        gopher.cc \
@@ -2152,6 +2156,7 @@ tests_test_http_range_SOURCES = \
        forward.cc \
        fqdncache.h \
        fqdncache.cc \
+       ftp.h \
        ftp.cc \
        gopher.h \
        gopher.cc \
@@ -2410,6 +2415,7 @@ tests_testHttpRequest_SOURCES = \
        forward.cc \
        fqdncache.h \
        fqdncache.cc \
+       ftp.h \
        ftp.cc \
        gopher.h \
        gopher.cc \
@@ -3398,6 +3404,7 @@ tests_testURL_SOURCES = \
        forward.cc \
        fqdncache.h \
        fqdncache.cc \
+       ftp.h \
        ftp.cc \
        gopher.h \
        gopher.cc \

diff --git a/src/errorpage.cc b/src/errorpage.cc
index 5de5d3a5787a9606114fe4e17533df4b8834fbb5..556062a176ded2344d38f87d1cde06f464100ce2 100644 (file)
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -38,6 +38,7 @@
 #include "disk.h"
 #include "err_detail_type.h"
 #include "errorpage.h"
+#include "ftp.h"
 #include "Store.h"
 #include "html_quote.h"
 #include "HttpReply.h"

diff --git a/src/forward.cc b/src/forward.cc
index ca1487c07fca3d8db7a10e55326cd5dceec373db..1ae03abf41b8c58cd5da1c6c779e57ae278f9f64 100644 (file)
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -47,6 +47,7 @@
 #include "fd.h"
 #include "fde.h"
 #include "forward.h"
+#include "ftp.h"
 #include "globals.h"
 #include "gopher.h"
 #include "hier_code.h"

diff --git a/src/ftp.h b/src/ftp.h
new file mode 100644 (file)
index 0000000..49f279a
--- /dev/null
+++ b/src/ftp.h
@@ -0,0 +1,49 @@
+/*
+ * DEBUG: section 
+ * AUTHOR: 
+ *
+ * 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_FTP_H_
+#define SQUID_FTP_H_
+
+class FwdState;
+
+/**
+ * \defgroup ServerProtocolFTPAPI Server-Side FTP API
+ * \ingroup ServerProtocol
+ */
+
+/// \ingroup ServerProtocolFTPAPI
+extern void ftpStart(FwdState *);
+/// \ingroup ServerProtocolFTPAPI
+extern const char *ftpUrlWith2f(HttpRequest *);
+
+
+#endif /* SQUID_FTP_H_ */

diff --git a/src/protos.h b/src/protos.h
index 6f318fd1ba4e163099809f6dde5a0e52ad57ca6a..e2518d0043ebe442dc4890d2632f7d8a4baa87bf 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -54,20 +54,10 @@ class ClientInfo;
 
 class FwdState;
 
-/**
- \defgroup ServerProtocolFTPAPI Server-Side FTP API
- \ingroup ServerProtocol
- */
-
-/// \ingroup ServerProtocolFTPAPI
-SQUIDCEXTERN void ftpStart(FwdState *);
 
 class HttpRequest;
 class HttpReply;
 
-/// \ingroup ServerProtocolFTPAPI
-SQUIDCEXTERN const char *ftpUrlWith2f(HttpRequest *);
-