Moved some prototypes to newly-created int.h, SquidString.h, disk.h

diff --cc src/Makefile.am
index 2b136b7237426f2df976142cda1b8ec175e198cb,2b136b7237426f2df976142cda1b8ec175e198cb..c8ca66bbe31513fc634cb92f939015049e0ea25b
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -393,6 -393,6 +393,7 @@@ squid_SOURCES = 
        icp_opcode.h \
        icp_v2.cc \
        icp_v3.cc \
++      int.h \
        int.cc \
        internal.h \
        internal.cc \
@@@ -704,6 -704,6 +705,7 @@@ ufsdump_SOURCES = 
        cbdata.h \
        cbdata.cc \
        debug.cc \
++      int.h \
        int.cc \
        Mem.h \
        mem.cc \
@@@ -1211,6 -1211,6 +1213,7 @@@ tests_testACLMaxUserIP_SOURCES= 
        HttpHdrScTarget.cc \
        HttpMsg.cc \
        HttpRequestMethod.cc \
++      int.h \
        int.cc \
        SquidList.h \
        SquidList.cc \
@@@ -1427,6 -1427,6 +1430,7 @@@ tests_testCacheManager_SOURCES = 
        icp_v3.cc \
        $(IPC_SOURCE) \
        ipcache.cc \
++      int.h \
        int.cc \
        internal.h \
        internal.cc \
@@@ -1597,6 -1597,6 +1601,7 @@@ tests_testDiskIO_SOURCES = 
        HttpReply.cc \
        HttpRequestMethod.cc \
        HttpStatusLine.cc \
++      int.h \
        int.cc \
        SquidList.h \
        SquidList.cc \
@@@ -1813,6 -1813,6 +1818,7 @@@ tests_testEvent_SOURCES = 
        icp_v3.cc \
        $(IPC_SOURCE) \
        ipcache.cc \
++      int.h \
        int.cc \
        internal.h \
        internal.cc \
@@@ -2042,6 -2042,6 +2048,7 @@@ tests_testEventLoop_SOURCES = 
        icp_v3.cc \
        $(IPC_SOURCE) \
        ipcache.cc \
++      int.h \
        int.cc \
        internal.h \
        internal.cc \
@@@ -2266,6 -2266,6 +2273,7 @@@ tests_test_http_range_SOURCES = 
        HttpStatusLine.cc \
        icp_v2.cc \
        icp_v3.cc \
++      int.h \
        int.cc \
        internal.h \
        internal.cc \
@@@ -2538,6 -2538,6 +2546,7 @@@ tests_testHttpRequest_SOURCES = 
        icp_v3.cc \
        $(IPC_SOURCE) \
        ipcache.cc \
++      int.h \
        int.cc \
        internal.h \
        internal.cc \
@@@ -2701,6 -2701,6 +2710,7 @@@ tests_testStore_SOURCES= 
        HttpHeader.cc \
        HttpMsg.cc \
        HttpRequestMethod.cc \
++      int.h \
        int.cc \
        SquidList.h \
        SquidList.cc \
@@@ -2916,6 -2916,6 +2926,7 @@@ tests_testUfs_SOURCES = 
        HttpBody.cc \
        HttpReply.cc \
        HttpStatusLine.cc \
++      int.h \
        int.cc \
        SquidList.h \
        SquidList.cc \
@@@ -3079,6 -3079,6 +3090,7 @@@ tests_testRock_SOURCES = 
        HttpReply.cc \
        HttpRequestMethod.cc \
        HttpStatusLine.cc \
++      int.h \
        int.cc \
        SquidList.h \
        SquidList.cc \
@@@ -3222,6 -3222,6 +3234,7 @@@ tests_testCoss_SOURCES = 
        HttpBody.cc \
        HttpReply.cc \
        HttpStatusLine.cc \
++      int.h \
        int.cc \
        SquidList.h \
        SquidList.cc \
@@@ -3372,6 -3372,6 +3385,7 @@@ tests_testNull_SOURCES = 
        HttpBody.cc \
        HttpReply.cc \
        HttpStatusLine.cc \
++      int.h \
        int.cc \
        SquidList.h \
        SquidList.cc \
@@@ -3577,6 -3577,6 +3591,7 @@@ tests_testURL_SOURCES = 
        icp_v3.cc \
        $(IPC_SOURCE) \
        ipcache.cc \
++      int.h \
        int.cc \
        internal.h \
        internal.cc \

diff --cc src/SquidString.h
index b0afd6e04cc2d0233d322ec3283cefe7368828c8,b0afd6e04cc2d0233d322ec3283cefe7368828c8..4b2214f0499ad663b1e2b833da90807dd6e12dae
--- 1/src/SquidString.h
--- 2/src/SquidString.h
+++ b/src/SquidString.h
@@@ -186,7 -186,7 +186,8 @@@ _SQUID_INLINE_ bool operator<(const Str
  #endif
  
  extern const char *checkNullString(const char *p);
--extern int stringHasWhitespace(const char *); //String.cc
--extern int stringHasCntl(const char *); //String.cc
++extern int stringHasWhitespace(const char *);
++extern int stringHasCntl(const char *);
++extern char *strwordtok(char *buf, char **t);
  
  #endif /* SQUID_STRING_H */

diff --cc src/StoreMetaMD5.cc
index b08f26f73696bddaff2207a88cf26d849d36ec2b,b08f26f73696bddaff2207a88cf26d849d36ec2b..02d40c0f468435e52aac781671cdd89fc57e8784
--- 1/src/StoreMetaMD5.cc
--- 2/src/StoreMetaMD5.cc
+++ b/src/StoreMetaMD5.cc
@@@ -34,6 -34,6 +34,7 @@@
   */
  
  #include "squid.h"
++#include "int.h"
  #include "md5.h"
  #include "MemObject.h"
  #include "protos.h"

diff --cc src/cache_cf.cc
index b529ccf763ccec6e49b3d3a24ffd9b91b4667cc7,b529ccf763ccec6e49b3d3a24ffd9b91b4667cc7..96c650fbb10a020d48b613a01a958eb7c9f44148
--- 1/src/cache_cf.cc
--- 2/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@@ -61,6 -61,6 +61,7 @@@
  #include "PeerDigest.h"
  #include "protos.h"
  #include "rfc1738.h"
++#include "SquidString.h"
  #include "Store.h"
  #include "StoreFileSystem.h"
  #include "structs.h"

diff --cc src/disk.h
index dca9db41dc9a98ad12ad51252044705d215a0e81,dca9db41dc9a98ad12ad51252044705d215a0e81..985af5ae3add3daf3e508550beac275bb9a3db15
--- 1/src/disk.h
--- 2/src/disk.h
+++ b/src/disk.h
@@@ -54,5 -54,5 +54,6 @@@ extern void file_write_mbuf(int fd, off
  extern void file_read(int, char *, int, off_t, DRCB *, void *);
  extern void disk_init(void);
  extern void safeunlink(const char *path, int quiet);
++extern int xrename(const char *from, const char *to); //disk.cc
  
  #endif /* SQUID_DISK_H_ */

diff --cc src/external_acl.cc
index afa7068eddfaa5834b1662632911107734680770,afa7068eddfaa5834b1662632911107734680770..f00e3758456400f37b7bba2a8e572173c5203487
--- 1/src/external_acl.cc
--- 2/src/external_acl.cc
+++ b/src/external_acl.cc
@@@ -46,8 -46,8 +46,8 @@@
  #include "cache_cf.h"
  #include "client_side.h"
  #include "comm/Connection.h"
--#include "ExternalACLEntry.h"
  #include "ExternalACL.h"
++#include "ExternalACLEntry.h"
  #include "fde.h"
  #include "helper.h"
  #include "HttpHeaderTools.h"
@@@ -58,11 -58,11 +58,12 @@@
  #include "mgr/Registration.h"
  #include "protos.h"
  #include "rfc1738.h"
++#include "SquidString.h"
  #include "SquidTime.h"
  #include "Store.h"
--#include "URLScheme.h"
  #include "tools.h"
  #include "URL.h"
++#include "URLScheme.h"
  #include "wordlist.h"
  #if USE_SSL
  #include "ssl/support.h"

diff --cc src/int.cc
index 69ba03cd889a3c522882dc58f93290abf8bc7a88,69ba03cd889a3c522882dc58f93290abf8bc7a88..89df0ecd729bba9cb95e6e7b69e2077667fb0a2a
--- 1/src/int.cc
--- 2/src/int.cc
+++ b/src/int.cc
@@@ -1,7 -1,7 +1,4 @@@
--
  /*
-- * $Id$
-- *
   * DEBUG: section 21    Integer functions
   * AUTHOR: Harvest Derived
   *

diff --cc src/int.h
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..e3baaa3e6a9cac63ef7b020721614d280ffc41af
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/src/int.h
@@@ -1,0 -1,0 +1,37 @@@
++#ifndef SQUID_INT_H_
++#define SQUID_INT_H_
++/*
++ * DEBUG: section 21    Integer functions
++ * AUTHOR: Harvest Derived
++ *
++ * 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 int isPowTen(int); //int.cc
++
++#endif /* SQUID_INT_H_ */

diff --cc src/neighbors.cc
index 5b722b8d43df86892fdaa0a8884446ac5fa286d8,5b722b8d43df86892fdaa0a8884446ac5fa286d8..351910d7af7e073345029837ae85d671e749d038
--- 1/src/neighbors.cc
--- 2/src/neighbors.cc
+++ b/src/neighbors.cc
@@@ -43,6 -43,6 +43,7 @@@
  #include "HttpRequest.h"
  #include "icmp/net_db.h"
  #include "ICP.h"
++#include "int.h"
  #include "ip/Address.h"
  #include "ip/tools.h"
  #include "ipcache.h"

diff --cc src/protos.h
index 5b2b72140dbfd91d51cfc2c4d0f48dce3a3e861a,a4f4a59480e4f84dba945caed33ddf4b24745ddc..2b1f22d921299c2900e3b1fb2e7be5208d017d80
--- 1/src/protos.h
--- 2/src/protos.h
+++ b/src/protos.h
@@@ -88,10 -80,10 +80,6 @@@ extern void reconfigure(int)
  
  #include "fatal.h"
  
--SQUIDCEXTERN int xrename(const char *from, const char *to); //disk.cc
--extern int isPowTen(int); //int.cc
--
--SQUIDCEXTERN char *strwordtok(char *buf, char **t); //String.cc
  
  /*
   * ipc.c

diff --cc src/ssl/helper.cc
index ee81402e085444433245de412602d78e57d285d6,ee81402e085444433245de412602d78e57d285d6..13073125ef5404e1dd54d95b172b0eb504294423
--- 1/src/ssl/helper.cc
--- 2/src/ssl/helper.cc
+++ b/src/ssl/helper.cc
@@@ -7,6 -7,6 +7,7 @@@
  #include "protos.h"
  #include "ssl/Config.h"
  #include "ssl/helper.h"
++#include "SquidString.h"
  #include "SquidTime.h"
  #include "SwapDir.h"
  #include "wordlist.h"