From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Wed, 3 Oct 2012 17:32:57 +0000 (+0200)
Subject: removed many SQUIDCEXTERN declarations
X-Git-Tag: SQUID_3_3_0_1~31^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9c252f224ff07e65094b2521a210a5dc18d291e;p=thirdparty%2Fsquid.git

removed many SQUIDCEXTERN declarations
---

d9c252f224ff07e65094b2521a210a5dc18d291e
diff --cc src/CpuAffinity.h
index 987c0b22d9,987c0b22d9..e14b72f84d
--- a/src/CpuAffinity.h
+++ b/src/CpuAffinity.h
@@@ -5,12 -5,12 +5,12 @@@
  #define SQUID_CPU_AFFINITY_H
  
  /// set CPU affinity for this process on startup
--SQUIDCEXTERN void CpuAffinityInit();
++void CpuAffinityInit();
  
  /// reconfigure CPU affinity for this process
--SQUIDCEXTERN void CpuAffinityReconfigure();
++void CpuAffinityReconfigure();
  
  /// check CPU affinity configuration and print warnings if needed
--SQUIDCEXTERN void CpuAffinityCheck();
++void CpuAffinityCheck();
  
  #endif // SQUID_CPU_AFFINITY_H
diff --cc src/DiskIO/DiskThreads/aiops.cc
index 2059dfeb3e,2059dfeb3e..b3ae20d93d
--- a/src/DiskIO/DiskThreads/aiops.cc
+++ b/src/DiskIO/DiskThreads/aiops.cc
@@@ -107,7 -107,7 +107,7 @@@ struct squidaio_thread_t 
  
  static void squidaio_queue_request(squidaio_request_t *);
  static void squidaio_cleanup_request(squidaio_request_t *);
--SQUIDCEXTERN void *squidaio_thread_loop(void *);
++void *squidaio_thread_loop(void *);
  static void squidaio_do_open(squidaio_request_t *);
  static void squidaio_do_read(squidaio_request_t *);
  static void squidaio_do_write(squidaio_request_t *);
diff --cc src/HttpMsg.h
index 25f2c6a467,25f2c6a467..aaed1240e2
--- a/src/HttpMsg.h
+++ b/src/HttpMsg.h
@@@ -130,7 -130,7 +130,7 @@@ protected
  
  };
  
--SQUIDCEXTERN int httpMsgIsolateHeaders(const char **parse_start, int len, const char **blk_start, const char **blk_end);
++int httpMsgIsolateHeaders(const char **parse_start, int len, const char **blk_start, const char **blk_end);
  
  #define HTTPMSGUNLOCK(a) if(a){(a)->_unlock();(a)=NULL;}
  #define HTTPMSGLOCK(a) (a)->_lock()
diff --cc src/HttpStatusLine.h
index 99e1a65531,99e1a65531..1e3176ac59
--- a/src/HttpStatusLine.h
+++ b/src/HttpStatusLine.h
@@@ -62,19 -62,19 +62,19 @@@ public
  };
  
  /* init/clean */
--SQUIDCEXTERN void httpStatusLineInit(HttpStatusLine * sline);
--SQUIDCEXTERN void httpStatusLineClean(HttpStatusLine * sline);
++void httpStatusLineInit(HttpStatusLine * sline);
++void httpStatusLineClean(HttpStatusLine * sline);
  /* set/get values */
--SQUIDCEXTERN void httpStatusLineSet(HttpStatusLine * sline, HttpVersion version,
++void httpStatusLineSet(HttpStatusLine * sline, HttpVersion version,
                                      http_status status, const char *reason);
--SQUIDCEXTERN const char *httpStatusLineReason(const HttpStatusLine * sline);
++const char *httpStatusLineReason(const HttpStatusLine * sline);
  /* parse/pack */
  /* parse a 0-terminating buffer and fill internal structires; returns true on success */
--SQUIDCEXTERN int httpStatusLineParse(HttpStatusLine * sline, const String &protoPrefix,
++int httpStatusLineParse(HttpStatusLine * sline, const String &protoPrefix,
                                       const char *start, const char *end);
  /* pack fields using Packer */
--SQUIDCEXTERN void httpStatusLinePackInto(const HttpStatusLine * sline, Packer * p);
++void httpStatusLinePackInto(const HttpStatusLine * sline, Packer * p);
  
--SQUIDCEXTERN const char *httpStatusString(http_status status);
++const char *httpStatusString(http_status status);
  
  #endif /* SQUID_HTTPSTATUSLINE_H */
diff --cc src/MemBuf.h
index 3c5f225d46,3c5f225d46..a35bf432f2
--- a/src/MemBuf.h
+++ b/src/MemBuf.h
@@@ -173,8 -173,8 +173,8 @@@ private
  #endif
  
  /** returns free() function to be used, _freezes_ the object! */
--SQUIDCEXTERN void memBufReport(MemBuf * mb);
++void memBufReport(MemBuf * mb);
  /** pack content into a mem buf. */
--SQUIDCEXTERN void packerToMemInit(Packer * p, MemBuf * mb);
++void packerToMemInit(Packer * p, MemBuf * mb);
  
  #endif /* SQUID_MEM_H */
diff --cc src/Packer.h
index 54878db05a,54878db05a..5d224ff2d2
--- a/src/Packer.h
+++ b/src/Packer.h
@@@ -53,9 -53,9 +53,8 @@@ public
      void *real_handler;		/* first parameter to real append and vprintf */
  };
  
--SQUIDCEXTERN void packerClean(Packer * p);
--SQUIDCEXTERN void packerAppend(Packer * p, const char *buf, int size);
--SQUIDCEXTERN void
--packerPrintf(Packer * p, const char *fmt,...) PRINTF_FORMAT_ARG2;
++void packerClean(Packer * p);
++void packerAppend(Packer * p, const char *buf, int size);
++void packerPrintf(Packer * p, const char *fmt,...) PRINTF_FORMAT_ARG2;
  
  #endif /* SQUID_PACKER_H */
diff --cc src/PeerSelectState.h
index e589e6cf1a,e589e6cf1a..6823bb7533
--- a/src/PeerSelectState.h
+++ b/src/PeerSelectState.h
@@@ -47,8 -47,8 +47,8 @@@ class ErrorState
  
  typedef void PSC(Comm::ConnectionList *, ErrorState *, void *);
  
--SQUIDCEXTERN void peerSelect(Comm::ConnectionList *, HttpRequest *, StoreEntry *, PSC *, void *data);
--SQUIDCEXTERN void peerSelectInit(void);
++void peerSelect(Comm::ConnectionList *, HttpRequest *, StoreEntry *, PSC *, void *data);
++void peerSelectInit(void);
  
  /**
   * A CachePeer which has been selected as a possible destination.
diff --cc src/StoreIOState.h
index 03e84b6064,03e84b6064..17317b8aca
--- a/src/StoreIOState.h
+++ b/src/StoreIOState.h
@@@ -111,8 -111,8 +111,8 @@@ public
  
  StoreIOState::Pointer storeCreate(StoreEntry *, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *);
  StoreIOState::Pointer storeOpen(StoreEntry *, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *);
--SQUIDCEXTERN void storeClose(StoreIOState::Pointer, int how);
--SQUIDCEXTERN void storeRead(StoreIOState::Pointer, char *, size_t, off_t, StoreIOState::STRCB *, void *);
--SQUIDCEXTERN void storeIOWrite(StoreIOState::Pointer, char const *, size_t, off_t, FREE *);
++void storeClose(StoreIOState::Pointer, int how);
++void storeRead(StoreIOState::Pointer, char *, size_t, off_t, StoreIOState::STRCB *, void *);
++void storeIOWrite(StoreIOState::Pointer, char const *, size_t, off_t, FREE *);
  
  #endif /* SQUID_STOREIOSTATE_H */
diff --cc src/StoreMeta.h
index e71c415583,e71c415583..80df78d367
--- a/src/StoreMeta.h
+++ b/src/StoreMeta.h
@@@ -151,10 -151,10 +151,10 @@@ public
  };
  
  /// \ingroup SwapStoreAPI
--SQUIDCEXTERN char *storeSwapMetaPack(tlv * tlv_list, int *length);
++char *storeSwapMetaPack(tlv * tlv_list, int *length);
  /// \ingroup SwapStoreAPI
--SQUIDCEXTERN tlv *storeSwapMetaBuild(StoreEntry * e);
++tlv *storeSwapMetaBuild(StoreEntry * e);
  /// \ingroup SwapStoreAPI
--SQUIDCEXTERN void storeSwapTLVFree(tlv * n);
++void storeSwapTLVFree(tlv * n);
  
  #endif /* SQUID_TYPELENGTHVALUE_H */
diff --cc src/StoreMetaUnpacker.h
index 91e68ced9c,91e68ced9c..059bf0e433
--- a/src/StoreMetaUnpacker.h
+++ b/src/StoreMetaUnpacker.h
@@@ -64,10 -64,10 +64,10 @@@ private
  /*
   * store_swapmeta.c
   */
--SQUIDCEXTERN char *storeSwapMetaPack(StoreMeta * tlv_list, int *length);
--SQUIDCEXTERN StoreMeta *storeSwapMetaBuild(StoreEntry * e);
--SQUIDCEXTERN StoreMeta *storeSwapMetaUnpack(const char *buf, int *hdrlen);
--SQUIDCEXTERN void storeSwapTLVFree(StoreMeta * n);
++char *storeSwapMetaPack(StoreMeta * tlv_list, int *length);
++StoreMeta *storeSwapMetaBuild(StoreEntry * e);
++StoreMeta *storeSwapMetaUnpack(const char *buf, int *hdrlen);
++void storeSwapTLVFree(StoreMeta * n);
  StoreMeta ** storeSwapTLVAdd(int type, const void *ptr, size_t len, StoreMeta ** tail);
  
  #endif /* SQUID_TYPELENGTHVALUEUNPACKER_H */
diff --cc src/clientStream.h
index 76345c0806,76345c0806..c5abb04e15
--- a/src/clientStream.h
+++ b/src/clientStream.h
@@@ -136,13 -136,13 +136,13 @@@ public
  };
  
  /// \ingroup ClientStreamAPI
--SQUIDCEXTERN void clientStreamInit(dlink_list *, CSR *, CSD *, CSS *, ClientStreamData, CSCB *, CSD *, ClientStreamData, StoreIOBuffer tailBuffer);
++void clientStreamInit(dlink_list *, CSR *, CSD *, CSS *, ClientStreamData, CSCB *, CSD *, ClientStreamData, StoreIOBuffer tailBuffer);
  
  /// \ingroup ClientStreamAPI
--SQUIDCEXTERN void clientStreamInsertHead(dlink_list *, CSR *, CSCB *, CSD *, CSS *, ClientStreamData);
++void clientStreamInsertHead(dlink_list *, CSR *, CSCB *, CSD *, CSS *, ClientStreamData);
  
  /// \ingroup ClientStreamAPI
--SQUIDCEXTERN clientStreamNode *clientStreamNew(CSR *, CSCB *, CSD *, CSS *, ClientStreamData);
++clientStreamNode *clientStreamNew(CSR *, CSCB *, CSD *, CSS *, ClientStreamData);
  
  /**
   \ingroup ClientStreamAPI
@@@ -157,7 -157,7 +157,7 @@@
   			Each node may alter the reply if appropriate.
   \param replyBuffer	- buffer, length - where and how much.
   */
--SQUIDCEXTERN void clientStreamCallback(clientStreamNode *thisObject, ClientHttpRequest *http, HttpReply *rep, StoreIOBuffer replyBuffer);
++void clientStreamCallback(clientStreamNode *thisObject, ClientHttpRequest *http, HttpReply *rep, StoreIOBuffer replyBuffer);
  
  /**
   \ingroup ClientStreamAPI
@@@ -170,7 -170,7 +170,7 @@@
   \param http		Superset of request data, being winnowed down over time. MUST NOT be NULL.
   \param readBuffer	- offset, length, buffer - what, how much and where.
   */
--SQUIDCEXTERN void clientStreamRead(clientStreamNode *thisObject, ClientHttpRequest *http, StoreIOBuffer readBuffer);
++void clientStreamRead(clientStreamNode *thisObject, ClientHttpRequest *http, StoreIOBuffer readBuffer);
  
  /**
   \ingroup ClientStreamAPI
@@@ -182,7 -182,7 +182,7 @@@
   \param thisObject	'this' reference for the client stream
   \param http		MUST NOT be NULL.
   */
--SQUIDCEXTERN void clientStreamDetach(clientStreamNode *thisObject, ClientHttpRequest *http);
++void clientStreamDetach(clientStreamNode *thisObject, ClientHttpRequest *http);
  
  /**
   \ingroup ClientStreamAPI
@@@ -193,7 -193,7 +193,7 @@@
   \param thisObject	'this' reference for the client stream
   \param http		MUST NOT be NULL.
   */
--SQUIDCEXTERN void clientStreamAbort(clientStreamNode *thisObject, ClientHttpRequest *http);
++void clientStreamAbort(clientStreamNode *thisObject, ClientHttpRequest *http);
  
  /**
   \ingroup ClientStreamAPI
@@@ -207,6 -207,6 +207,6 @@@
   \param thisObject	'this' reference for the client stream
   \param http		MUST NOT be NULL.
   */
--SQUIDCEXTERN clientStream_status_t clientStreamStatus(clientStreamNode *thisObject, ClientHttpRequest *http);
++clientStream_status_t clientStreamStatus(clientStreamNode *thisObject, ClientHttpRequest *http);
  
  #endif /* SQUID_CLIENTSTREAM_H */
diff --cc src/debug.cc
index 5601a84fd5,5601a84fd5..590587b776
--- a/src/debug.cc
+++ b/src/debug.cc
@@@ -63,7 -63,7 +63,7 @@@ static void _db_print_stderr(const cha
  static void _db_print_file(const char *format, va_list args);
  
  #if _SQUID_MSWIN_
--SQUIDCEXTERN LPCRITICAL_SECTION dbg_mutex;
++extern LPCRITICAL_SECTION dbg_mutex;
  typedef BOOL (WINAPI * PFInitializeCriticalSectionAndSpinCount) (LPCRITICAL_SECTION, DWORD);
  #endif
  
diff --cc src/errorpage.h
index 0103f4a123,0103f4a123..d00698ee2f
--- a/src/errorpage.h
+++ b/src/errorpage.h
@@@ -203,10 -203,10 +203,10 @@@ private
   \par Global effects:
   *            error_text[] - is modified
   */
--SQUIDCEXTERN void errorInitialize(void);
++void errorInitialize(void);
  
  /// \ingroup ErrorPageAPI
--SQUIDCEXTERN void errorClean(void);
++void errorClean(void);
  
  /**
   * \ingroup ErrorPageAPI
@@@ -228,7 -228,7 +228,7 @@@
   \param clientConn  socket where page object is to be written
   \param err         This object is destroyed after use in this function.
   */
--SQUIDCEXTERN void errorSend(const Comm::ConnectionPointer &conn, ErrorState *err);
++void errorSend(const Comm::ConnectionPointer &conn, ErrorState *err);
  
  /**
   \ingroup ErrorPageAPI
@@@ -246,12 -246,12 +246,12 @@@
   \param entry   ??
   \param err     This object is destroyed after use in this function.
   */
--SQUIDCEXTERN void errorAppendEntry(StoreEntry *entry, ErrorState *err);
++void errorAppendEntry(StoreEntry *entry, ErrorState *err);
  
  /// \ingroup ErrorPageAPI
--SQUIDCEXTERN err_type errorReservePageId(const char *page_name);
++err_type errorReservePageId(const char *page_name);
  
--SQUIDCEXTERN const char *errorPageName(int pageId); ///< error ID to string
++const char *errorPageName(int pageId); ///< error ID to string
  
  /**
   \ingroup ErrorPageAPI
diff --cc src/fde.h
index 57ee4241b7,57ee4241b7..e166675c1b
--- a/src/fde.h
+++ b/src/fde.h
@@@ -192,7 -192,7 +192,7 @@@ private
      }
  };
  
--SQUIDCEXTERN int fdNFree(void);
++int fdNFree(void);
  
  #define FD_READ_METHOD(fd, buf, len) (*fd_table[fd].read_method)(fd, buf, len)
  #define FD_WRITE_METHOD(fd, buf, len) (*fd_table[fd].write_method)(fd, buf, len)
diff --cc src/helper.h
index 21bd17730d,21bd17730d..d929049c26
--- a/src/helper.h
+++ b/src/helper.h
@@@ -199,15 -199,15 +199,15 @@@ public
  MEMPROXY_CLASS_INLINE(helper_stateful_request);
  
  /* helper.c */
--SQUIDCEXTERN void helperOpenServers(helper * hlp);
--SQUIDCEXTERN void helperStatefulOpenServers(statefulhelper * hlp);
--SQUIDCEXTERN void helperSubmit(helper * hlp, const char *buf, HLPCB * callback, void *data);
--SQUIDCEXTERN void helperStatefulSubmit(statefulhelper * hlp, const char *buf, HLPSCB * callback, void *data, helper_stateful_server * lastserver);
--SQUIDCEXTERN void helperStats(StoreEntry * sentry, helper * hlp, const char *label = NULL);
--SQUIDCEXTERN void helperStatefulStats(StoreEntry * sentry, statefulhelper * hlp, const char *label = NULL);
--SQUIDCEXTERN void helperShutdown(helper * hlp);
--SQUIDCEXTERN void helperStatefulShutdown(statefulhelper * hlp);
--SQUIDCEXTERN void helperStatefulReleaseServer(helper_stateful_server * srv);
--SQUIDCEXTERN void *helperStatefulServerGetData(helper_stateful_server * srv);
++void helperOpenServers(helper * hlp);
++void helperStatefulOpenServers(statefulhelper * hlp);
++void helperSubmit(helper * hlp, const char *buf, HLPCB * callback, void *data);
++void helperStatefulSubmit(statefulhelper * hlp, const char *buf, HLPSCB * callback, void *data, helper_stateful_server * lastserver);
++void helperStats(StoreEntry * sentry, helper * hlp, const char *label = NULL);
++void helperStatefulStats(StoreEntry * sentry, statefulhelper * hlp, const char *label = NULL);
++void helperShutdown(helper * hlp);
++void helperStatefulShutdown(statefulhelper * hlp);
++void helperStatefulReleaseServer(helper_stateful_server * srv);
++void *helperStatefulServerGetData(helper_stateful_server * srv);
  
  #endif /* SQUID_HELPER_H */
diff --cc src/icmp/Icmp4.h
index f7b32959c0,f7b32959c0..231fc668d7
--- a/src/icmp/Icmp4.h
+++ b/src/icmp/Icmp4.h
@@@ -168,7 -168,7 +168,7 @@@ public
  #if USE_ICMP
  
  /// pinger helper contains one of these as a global object.
--SQUIDCEXTERN Icmp4 icmp4;
++extern Icmp4 icmp4;
  
  #endif /* USE_ICMP && SQUID_HELPER */
  
diff --cc src/icmp/Icmp6.h
index bb8f20a2b2,bb8f20a2b2..fa17a21bf9
--- a/src/icmp/Icmp6.h
+++ b/src/icmp/Icmp6.h
@@@ -80,7 -80,7 +80,7 @@@ public
  #if USE_ICMP
  
  /// pinger helper contains one of these as a global object.
--SQUIDCEXTERN Icmp6 icmp6;
++extern Icmp6 icmp6;
  
  #endif /* USE_ICMP && SQUID_HELPER */
  #endif /* _INCLUDE_ICMPV6_H */
diff --cc src/icmp/IcmpPinger.h
index 1de320ff87,1de320ff87..f53726f2b9
--- a/src/icmp/IcmpPinger.h
+++ b/src/icmp/IcmpPinger.h
@@@ -72,7 -72,7 +72,7 @@@ private
  #if USE_ICMP
  
  /// pinger helper contains one of these as a global object.
--SQUIDCEXTERN IcmpPinger control;
++extern IcmpPinger control;
  
  #endif
  
diff --cc src/icmp/IcmpSquid.h
index 78aaf455fd,78aaf455fd..ef2b30f518
--- a/src/icmp/IcmpSquid.h
+++ b/src/icmp/IcmpSquid.h
@@@ -60,6 -60,6 +60,6 @@@ public
  };
  
  // global engine within squid.
--SQUIDCEXTERN IcmpSquid icmpEngine;
++extern IcmpSquid icmpEngine;
  
  #endif /* _INCLUDE_ICMPSQUID_H */
diff --cc src/tests/test_http_range.cc
index 1bc8a1e669,1bc8a1e669..a4e0b4406c
--- a/src/tests/test_http_range.cc
+++ b/src/tests/test_http_range.cc
@@@ -47,30 -47,30 +47,30 @@@
  #include "acl/Checklist.h"
  #endif
  
--SQUIDCEXTERN void httpHeaderPutStr(HttpHeader * hdr, http_hdr_type type, const char *str)
++void httpHeaderPutStr(HttpHeader * hdr, http_hdr_type type, const char *str)
  {
      fatal ("dummy function\n");
  }
  
--SQUIDCEXTERN HttpHeaderEntry *httpHeaderGetEntry(const HttpHeader * hdr, HttpHeaderPos * pos)
++HttpHeaderEntry *httpHeaderGetEntry(const HttpHeader * hdr, HttpHeaderPos * pos)
  {
      fatal ("dummy function\n");
      return NULL;
  }
  
--extern String httpHeaderGetList(const HttpHeader * hdr, http_hdr_type id)
++String httpHeaderGetList(const HttpHeader * hdr, http_hdr_type id)
  {
      fatal ("dummy function\n");
      return String();
  }
  
--SQUIDCEXTERN int httpHeaderHas(const HttpHeader * hdr, http_hdr_type type)
++int httpHeaderHas(const HttpHeader * hdr, http_hdr_type type)
  {
      fatal ("dummy function\n");
      return 0;
  }
  
--SQUIDCEXTERN void httpHeaderPutContRange(HttpHeader * hdr, const HttpHdrContRange * cr)
++void httpHeaderPutContRange(HttpHeader * hdr, const HttpHdrContRange * cr)
  {
      fatal ("dummy function\n");
  }