From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Thu, 30 Aug 2012 08:56:00 +0000 (+0200)
Subject: Moved some prototypes to StoreClient.h
X-Git-Tag: sourceformat-review-1~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e87137f195606a91a3c6d569d42374c44121ac02;p=thirdparty%2Fsquid.git

Moved some prototypes to StoreClient.h
---

diff --git a/src/StoreClient.h b/src/StoreClient.h
index 72b204299a..626aa89e0d 100644
--- a/src/StoreClient.h
+++ b/src/StoreClient.h
@@ -127,6 +127,13 @@ private:
     CBDATA_CLASS(store_client);
 };
 
-SQUIDCEXTERN void storeClientCopy(store_client *, StoreEntry *, StoreIOBuffer, STCB *, void *);
+
+extern void storeClientCopy(store_client *, StoreEntry *, StoreIOBuffer, STCB *, void *);
+extern store_client* storeClientListAdd(StoreEntry * e, void *data);
+extern int storeClientCopyPending(store_client *, StoreEntry * e, void *data);
+extern int storeUnregister(store_client * sc, StoreEntry * e, void *data);
+extern int storePendingNClients(const StoreEntry * e);
+extern int storeClientIsThisAClient(store_client * sc, void *someClient);
+
 
 #endif /* SQUID_STORECLIENT_H */
diff --git a/src/acl/Asn.cc b/src/acl/Asn.cc
index 04ba4375d3..ffbd918d15 100644
--- a/src/acl/Asn.cc
+++ b/src/acl/Asn.cc
@@ -49,6 +49,7 @@
 #include "ipcache.h"
 #include "forward.h"
 #include "protos.h"
+#include "StoreClient.h"
 #include "wordlist.h"
 
 #define WHOIS_PORT 43
diff --git a/src/forward.cc b/src/forward.cc
index ca6b0156f2..bdff77be73 100644
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -66,6 +66,7 @@
 #include "protos.h"
 #include "SquidTime.h"
 #include "Store.h"
+#include "StoreClient.h"
 #include "urn.h"
 #include "whois.h"
 #if USE_SSL
diff --git a/src/icmp/net_db.cc b/src/icmp/net_db.cc
index a4794079ea..f9309018d4 100644
--- a/src/icmp/net_db.cc
+++ b/src/icmp/net_db.cc
@@ -61,6 +61,7 @@
 #include "URL.h"
 #include "Mem.h"
 #include "disk.h"
+#include "StoreClient.h"
 
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/src/protos.h b/src/protos.h
index 68d507dc2b..567020ea48 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -87,15 +87,6 @@ extern void rotate_logs(int);
 extern void reconfigure(int);
 
 class store_client;
-/*
- * store_client.c
- */
-SQUIDCEXTERN store_client *storeClientListAdd(StoreEntry * e, void *data);
-SQUIDCEXTERN int storeClientCopyPending(store_client *, StoreEntry * e, void *data);
-SQUIDCEXTERN int storeUnregister(store_client * sc, StoreEntry * e, void *data)
-;
-SQUIDCEXTERN int storePendingNClients(const StoreEntry * e);
-SQUIDCEXTERN int storeClientIsThisAClient(store_client * sc, void *someClient);
 
 SQUIDCEXTERN const char *getMyHostname(void);
 SQUIDCEXTERN const char *uniqueHostname(void);
diff --git a/src/ssl/ServerBump.cc b/src/ssl/ServerBump.cc
index 7bc8b3caa2..f82736ee6c 100644
--- a/src/ssl/ServerBump.cc
+++ b/src/ssl/ServerBump.cc
@@ -12,6 +12,7 @@
 #include "protos.h"
 #include "ssl/ServerBump.h"
 #include "Store.h"
+#include "StoreClient.h"
 #include "URL.h"
 
 CBDATA_NAMESPACED_CLASS_INIT(Ssl, ServerBump);
diff --git a/src/store.cc b/src/store.cc
index ebebef3930..fcbf2a8324 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -54,18 +54,18 @@
 #include "Stack.h"
 #include "StatCounters.h"
 #include "stmem.h"
-#include "StoreClient.h"
-#include "Store.h"
-#include "store_key_md5.h"
-#include "StoreIOState.h"
-#include "StoreMeta.h"
-#include "StrList.h"
 #include "store_digest.h"
 #include "store_key_md5.h"
+#include "store_key_md5.h"
 #include "store_log.h"
 #include "store_rebuild.h"
-#include "SwapDir.h"
+#include "Store.h"
+#include "StoreClient.h"
+#include "StoreIOState.h"
+#include "StoreMeta.h"
+#include "StrList.h"
 #include "swap_log_op.h"
+#include "SwapDir.h"
 #if USE_DELAY_POOLS
 #include "DelayPools.h"
 #endif
diff --git a/src/urn.cc b/src/urn.cc
index af6c8d6c0e..7f2c310338 100644
--- a/src/urn.cc
+++ b/src/urn.cc
@@ -35,17 +35,17 @@
 
 #include "squid.h"
 #include "errorpage.h"
-#include "StoreClient.h"
-#include "Store.h"
-#include "HttpReply.h"
-#include "HttpRequest.h"
-#include "MemBuf.h"
 #include "forward.h"
 #include "globals.h"
-#include "SquidTime.h"
+#include "HttpReply.h"
+#include "HttpRequest.h"
 #include "icmp/net_db.h"
+#include "MemBuf.h"
 #include "mime_header.h"
 #include "protos.h"
+#include "SquidTime.h"
+#include "Store.h"
+#include "StoreClient.h"
 #include "URL.h"
 #include "urn.h"