From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Wed, 29 Aug 2012 14:39:43 +0000 (+0200)
Subject: Moved urn.cc-related prototypes to newly-created urn.h
X-Git-Tag: sourceformat-review-1~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5eb529cb4c705b991c2b34a53fbfd70e4a1d824c;p=thirdparty%2Fsquid.git

Moved urn.cc-related prototypes to newly-created urn.h
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 48995659e1..e13f692516 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -518,6 +518,7 @@ squid_SOURCES = \
 	URL.h \
 	URLScheme.cc \
 	URLScheme.h \
+	urn.h \
 	urn.cc \
 	wccp.h \
 	wccp.cc \
@@ -1487,6 +1488,7 @@ tests_testCacheManager_SOURCES = \
 	$(UNLINKDSOURCE) \
 	url.cc \
 	URLScheme.cc \
+	urn.h \
 	urn.cc \
 	wccp2.h \
 	wccp2.cc \
@@ -1873,6 +1875,7 @@ tests_testEvent_SOURCES = \
 	$(UNLINKDSOURCE) \
 	url.cc \
 	URLScheme.cc \
+	urn.h \
 	urn.cc \
 	wccp2.h \
 	wccp2.cc \
@@ -2094,6 +2097,7 @@ tests_testEventLoop_SOURCES = \
 	$(UNLINKDSOURCE) \
 	url.cc \
 	URLScheme.cc \
+	urn.h \
 	urn.cc \
 	wccp2.h \
 	wccp2.cc \
@@ -2309,6 +2313,7 @@ tests_test_http_range_SOURCES = \
 	$(UNLINKDSOURCE) \
 	url.cc \
 	URLScheme.cc \
+	urn.h \
 	urn.cc \
 	wccp2.h \
 	wccp2.cc \
@@ -2563,6 +2568,7 @@ tests_testHttpRequest_SOURCES = \
 	MemStore.cc \
 	url.cc \
 	URLScheme.cc \
+	urn.h \
 	urn.cc \
 	wccp2.h \
 	wccp2.cc \
@@ -3592,6 +3598,7 @@ tests_testURL_SOURCES = \
 	tunnel.cc \
 	url.cc \
 	URLScheme.cc \
+	urn.h \
 	urn.cc \
 	wccp2.h \
 	wccp2.cc \
diff --git a/src/forward.cc b/src/forward.cc
index 0162b2d64b..ca6b0156f2 100644
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -66,6 +66,7 @@
 #include "protos.h"
 #include "SquidTime.h"
 #include "Store.h"
+#include "urn.h"
 #include "whois.h"
 #if USE_SSL
 #include "ssl/support.h"
diff --git a/src/protos.h b/src/protos.h
index 66a9d83c8b..c8bc357a75 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -82,8 +82,6 @@ extern variable_list *snmp_meshCtblFn(variable_list *, snint *);
 
 #include "comm/forward.h"
 
-SQUIDCEXTERN void urnStart(HttpRequest *, StoreEntry *);
-
 SQUIDCEXTERN void redirectInit(void);
 SQUIDCEXTERN void redirectShutdown(void);
 
diff --git a/src/urn.cc b/src/urn.cc
index 6b057e57ba..af6c8d6c0e 100644
--- a/src/urn.cc
+++ b/src/urn.cc
@@ -47,6 +47,7 @@
 #include "mime_header.h"
 #include "protos.h"
 #include "URL.h"
+#include "urn.h"
 
 #define	URN_REQBUF_SZ	4096
 
diff --git a/src/urn.h b/src/urn.h
new file mode 100644
index 0000000000..cd5f2dcdf7
--- /dev/null
+++ b/src/urn.h
@@ -0,0 +1,41 @@
+/*
+ * 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_URN_H_
+#define SQUID_URN_H_
+
+class HttpRequest;
+class StoreEntry;
+
+extern void urnStart(HttpRequest *, StoreEntry *);
+
+#endif /* SQUID_URN_H_ */