initial version of libsbuf

diff --git a/configure.ac b/configure.ac
index d852733ad70f819f4c78c444b99aea9622f90bcb..a2a5b3f7cc85924b7f1b2a0322b308c1d02df3c6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3881,6 +3881,7 @@ AC_CONFIG_FILES([
        src/mgr/Makefile
        src/parser/Makefile
        src/repl/Makefile
+       src/sbuf/Makefile
        src/security/Makefile
        src/security/cert_generators/Makefile
        src/security/cert_generators/file/Makefile

diff --git a/src/DiskIO/IpcIo/IpcIoFile.cc b/src/DiskIO/IpcIo/IpcIoFile.cc
index dfc99f14e049af4010922a05989c3566e2a2f8d7..ed5d7e4e9cf4c2b3be9da5aa8cdb4b3119ef8906 100644 (file)
--- a/src/DiskIO/IpcIo/IpcIoFile.cc
+++ b/src/DiskIO/IpcIo/IpcIoFile.cc
@@ -24,7 +24,7 @@
 #include "ipc/Queue.h"
 #include "ipc/StrandSearch.h"
 #include "ipc/UdsOp.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 #include "SquidConfig.h"
 #include "SquidTime.h"
 #include "StatCounters.h"

diff --git a/src/HttpHdrCc.cc b/src/HttpHdrCc.cc
index 8853c21865dc1c218e20d42e577900c7f06795ed..cc968c60bd00d60661b842a807c45398063c504b 100644 (file)
--- a/src/HttpHdrCc.cc
+++ b/src/HttpHdrCc.cc
@@ -15,7 +15,7 @@
 #include "HttpHeaderFieldStat.h"
 #include "HttpHeaderStat.h"
 #include "HttpHeaderTools.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 #include "StatHist.h"
 #include "Store.h"
 #include "StrList.h"

diff --git a/src/Makefile.am b/src/Makefile.am
index 0e5acccb669cce5b5747e742f628fd533c2db791..f1c3edd19c92a0de9b47228e560fa2b0ff7c3736 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,13 +13,10 @@ DNSSOURCE = \
 SBUF_SOURCE= \
        base/CharacterSet.h \
        base/InstanceId.h \
-       MemBlob.h \
-       MemBlob.cc \
-       OutOfBoundsException.h \
-       SBuf.h \
-       SBuf.cc \
-       SBufExceptions.h \
-       SBufExceptions.cc
+       sbuf/MemBlob.h \
+       sbuf/OutOfBoundsException.h \
+       sbuf/SBuf.h \
+       sbuf/SBufExceptions.h
 
 STOREMETA_SOURCE = \
        StoreMeta.cc \
@@ -42,8 +39,8 @@ LOADABLE_MODULES_SOURCES = \
        LoadableModules.h \
        LoadableModules.cc
 
-SUBDIRS        = mem base anyp helper dns ftp parser comm eui acl format clients servers fs repl store DiskIO
-DIST_SUBDIRS = mem base anyp helper dns ftp parser comm eui acl format clients servers fs repl store DiskIO
+SUBDIRS        = mem base anyp helper dns ftp parser comm eui acl format clients sbuf servers fs repl store DiskIO
+DIST_SUBDIRS = mem base anyp helper dns ftp parser comm eui acl format clients sbuf servers fs repl store DiskIO
 
 if ENABLE_AUTH
 SUBDIRS += auth
@@ -421,9 +418,6 @@ squid_SOURCES = \
        RemovalPolicy.h \
        send-announce.h \
        send-announce.cc \
-       $(SBUF_SOURCE) \
-       SBufAlgos.h \
-       SBufAlgos.cc \
        SBufDetailedStats.h \
        SBufDetailedStats.cc \
        SBufStatsAction.h \
@@ -550,6 +544,7 @@ squid_LDADD = \
        $(AUTH_LIBS) \
        acl/libapi.la \
        clients/libclients.la \
+       sbuf/libsbuf.la \
        servers/libservers.la \
        ftp/libftp.la \
        helper/libhelper.la \
@@ -571,6 +566,7 @@ squid_LDADD = \
        icmp/libicmp.la \
        log/liblog.la \
        format/libformat.la \
+       sbuf/libsbuf.la \
        $(XTRA_OBJS) \
        $(REPL_OBJS) \
        $(NETTLELIB) \
@@ -998,9 +994,6 @@ tests_testHttpReply_SOURCES=\
        Notes.cc \
        SquidString.h \
        SquidTime.h \
-       $(SBUF_SOURCE) \
-       SBufAlgos.h \
-       SBufAlgos.cc \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
        String.cc \
@@ -1054,6 +1047,7 @@ tests_testHttpReply_LDADD=\
        base/libbase.la \
        ipc/libipc.la \
        mem/libmem.la \
+       sbuf/libsbuf.la \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -1111,9 +1105,6 @@ tests_testACLMaxUserIP_SOURCES= \
        StrList.cc \
        tests/stub_StatHist.cc \
        stmem.cc \
-       $(SBUF_SOURCE) \
-       SBufAlgos.h \
-       SBufAlgos.cc \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
        String.cc \
@@ -1189,6 +1180,7 @@ tests_testACLMaxUserIP_LDADD= \
        ip/libip.la \
        ipc/libipc.la \
        mgr/libmgr.la \
+       sbuf/libsbuf.la \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -1379,9 +1371,6 @@ tests_testCacheManager_SOURCES = \
        refresh.h \
        refresh.cc \
        RemovalPolicy.cc \
-       $(SBUF_SOURCE) \
-       SBufAlgos.h \
-       SBufAlgos.cc \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
        $(SNMP_SOURCE) \
@@ -1473,6 +1462,7 @@ tests_testCacheManager_LDADD = \
        $(SNMP_LIBS) \
        mem/libmem.la \
        store/libstore.la \
+       sbuf/libsbuf.la \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -1552,9 +1542,6 @@ tests_testDiskIO_SOURCES = \
        StatHist.h \
        tests/stub_StatHist.cc \
        stmem.cc \
-       $(SBUF_SOURCE) \
-       SBufAlgos.h \
-       SBufAlgos.cc \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
        StoreFileSystem.cc \
@@ -1652,6 +1639,7 @@ tests_testDiskIO_LDADD = \
        base/libbase.la \
        mem/libmem.la \
        store/libstore.la \
+       sbuf/libsbuf.la \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -1818,9 +1806,6 @@ tests_testEvent_SOURCES = \
        RemovalPolicy.cc \
        StrList.h \
        StrList.cc \
-       $(SBUF_SOURCE) \
-       SBufAlgos.h \
-       SBufAlgos.cc \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
        $(SNMP_SOURCE) \
@@ -1917,6 +1902,7 @@ tests_testEvent_LDADD = \
        ipc/libipc.la \
        mgr/libmgr.la \
        store/libstore.la \
+       sbuf/libsbuf.la \
        $(SNMP_LIBS) \
        $(NETTLELIB) \
        $(REGEXLIB) \
@@ -2062,8 +2048,6 @@ tests_testEventLoop_SOURCES = \
        refresh.h \
        refresh.cc \
        $(SBUF_SOURCE) \
-       SBufAlgos.h \
-       SBufAlgos.cc \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
        $(SNMP_SOURCE) \
@@ -2161,6 +2145,7 @@ tests_testEventLoop_LDADD = \
        $(top_builddir)/lib/libmiscutil.la \
        ipc/libipc.la \
        mgr/libmgr.la \
+       sbuf/libsbuf.la \
        store/libstore.la \
        $(SNMP_LIBS) \
        $(NETTLELIB) \
@@ -2303,8 +2288,6 @@ tests_test_http_range_SOURCES = \
        refresh.cc \
        RemovalPolicy.cc \
        $(SBUF_SOURCE) \
-       SBufAlgos.h \
-       SBufAlgos.cc \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
        $(SNMP_SOURCE) \
@@ -2399,6 +2382,7 @@ tests_test_http_range_LDADD = \
        dns/libdns.la \
        base/libbase.la \
        mgr/libmgr.la \
+       sbuf/libsbuf.la \
        store/libstore.la \
        $(SNMP_LIBS) \
        $(top_builddir)/lib/libmisccontainers.la \
@@ -2434,6 +2418,7 @@ tests_testTokenizer_LDFLAGS = $(LIBADD_DL)
 tests_testTokenizer_LDADD = \
        parser/libparser.la \
        base/libbase.la \
+       sbuf/libsbuf.la \
        $(top_builddir)/lib/libmiscutil.la \
        $(COMPAT_LIB) \
        $(SQUID_CPPUNIT_LA) \
@@ -2450,8 +2435,6 @@ tests_testHttp1Parser_SOURCES = \
        String.cc \
        cache_cf.h \
        $(SBUF_SOURCE) \
-       SBufAlgos.h \
-       SBufAlgos.cc \
        tests/stub_SBufDetailedStats.cc \
        tests/stub_cache_cf.cc \
        tests/stub_cache_manager.cc \
@@ -2481,6 +2464,7 @@ tests_testHttp1Parser_LDADD= \
        SquidConfig.o \
        base/libbase.la \
        ip/libip.la \
+       sbuf/libsbuf.la \
        $(top_builddir)/lib/libmiscutil.la \
        $(SQUID_CPPUNIT_LIBS) \
        $(SSLLIB) \
@@ -2630,8 +2614,6 @@ tests_testHttpRequest_SOURCES = \
        refresh.cc \
        RemovalPolicy.cc \
        $(SBUF_SOURCE) \
-       SBufAlgos.h \
-       SBufAlgos.cc \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
        $(SNMP_SOURCE) \
@@ -2715,6 +2697,7 @@ tests_testHttpRequest_LDADD = \
        log/liblog.la \
        format/libformat.la \
        store/libstore.la \
+       sbuf/libsbuf.la \
        $(REPL_OBJS) \
        $(ADAPTATION_LIBS) \
        $(ESI_LIBS) \
@@ -2841,8 +2824,6 @@ tests_testStore_SOURCES= \
        store_key_md5.h \
        store_key_md5.cc \
        $(SBUF_SOURCE) \
-       SBufAlgos.h \
-       SBufAlgos.cc \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
        String.cc \
@@ -2930,6 +2911,7 @@ tests_testStore_LDADD= \
        anyp/libanyp.la \
        mem/libmem.la \
        store/libstore.la \
+       sbuf/libsbuf.la \
        DiskIO/libdiskio.la \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
@@ -2975,6 +2957,7 @@ tests_testString_LDADD = \
        base/libbase.la \
        libsquid.la \
        ip/libip.la \
+       sbuf/libsbuf.la \
        $(top_builddir)/lib/libmiscutil.la \
        $(REGEXLIB) \
        $(SQUID_CPPUNIT_LIBS) \
@@ -3082,8 +3065,6 @@ tests_testUfs_SOURCES = \
        tests/stub_helper.cc \
        cbdata.cc \
        $(SBUF_SOURCE) \
-       SBufAlgos.h \
-       SBufAlgos.cc \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
        String.cc \
@@ -3163,6 +3144,7 @@ tests_testUfs_LDADD = \
        ip/libip.la \
        mem/libmem.la \
        store/libstore.la \
+       sbuf/libsbuf.la \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -3261,8 +3243,6 @@ tests_testRock_SOURCES = \
        store_swapmeta.cc \
        store_swapout.cc \
        $(SBUF_SOURCE) \
-       SBufAlgos.h \
-       SBufAlgos.cc \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
        String.cc \
@@ -3339,6 +3319,7 @@ tests_testRock_LDADD = \
        base/libbase.la \
        mem/libmem.la \
        store/libstore.la \
+       sbuf/libsbuf.la \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -3480,8 +3461,6 @@ tests_testURL_SOURCES = \
        refresh.cc \
        RemovalPolicy.cc \
        $(SBUF_SOURCE) \
-       SBufAlgos.h \
-       SBufAlgos.cc \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
        $(SNMP_SOURCE) \
@@ -3580,6 +3559,7 @@ tests_testURL_LDADD = \
        log/liblog.la \
        format/libformat.la \
        store/libstore.la \
+       sbuf/libsbuf.la \
        $(REGEXLIB) \
        $(REPL_OBJS) \
        $(ADAPTATION_LIBS) \
@@ -3608,9 +3588,6 @@ tests_testSBuf_SOURCES= \
        $(SBUF_SOURCE) \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
-       SBufAlgos.h \
-       SBufAlgos.cc \
-       SBufStream.h \
        tests/stub_time.cc \
        tests/stub_debug.cc \
        tests/stub_fatal.cc \
@@ -3633,6 +3610,7 @@ tests_testSBuf_LDADD=\
        libsquid.la \
        ip/libip.la \
        mgr/libmgr.la \
+       sbuf/libsbuf.la \
        $(top_builddir)/lib/libmiscutil.la \
        $(REGEXLIB) \
        $(SQUID_CPPUNIT_LIBS) \
@@ -3644,13 +3622,8 @@ tests_testSBufList_SOURCES= \
        tests/testSBufList.h \
        tests/testSBufList.cc \
        $(SBUF_SOURCE) \
-       SBufList.h \
-       SBufList.cc \
-       SBufAlgos.h \
-       SBufAlgos.cc \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
-       SBufStream.h \
        tests/stub_time.cc \
        tests/stub_MemObject.cc \
        tests/stub_cbdata.cc \
@@ -3679,6 +3652,7 @@ tests_testSBufList_LDADD=\
        libsquid.la \
        ip/libip.la \
        mgr/libmgr.la \
+       sbuf/libsbuf.la \
        $(top_builddir)/lib/libmiscutil.la \
        $(SQUID_CPPUNIT_LIBS) \
        $(COMPAT_LIB) \
@@ -3715,6 +3689,7 @@ tests_testConfigParser_LDADD = \
        base/libbase.la \
        libsquid.la \
        ip/libip.la \
+       sbuf/libsbuf.la \
        $(top_builddir)/lib/libmiscutil.la \
        $(REGEXLIB) \
        $(SQUID_CPPUNIT_LIBS) \
@@ -3760,6 +3735,7 @@ nodist_tests_testStatHist_SOURCES = \
 tests_testStatHist_LDFLAGS = $(LIBADD_DL)
 tests_testStatHist_LDADD = \
        base/libbase.la \
+       sbuf/libsbuf.la \
        $(top_builddir)/lib/libmiscutil.la \
        $(top_builddir)/lib/libmisccontainers.la \
        $(SQUID_CPPUNIT_LIBS) \
@@ -3775,13 +3751,12 @@ tests_testLookupTable_SOURCES = \
        tests/stub_SBufDetailedStats.cc \
        base/LookupTable.h \
        String.cc \
-       $(SBUF_SOURCE) \
-       SBufAlgos.h \
-       SBufAlgos.cc
+       $(SBUF_SOURCE)
 nodist_tests_testLookupTable_SOURCES = $(TESTSOURCES)
 tests_testLookupTable_LDFLAGS = $(LIBADD_DL)
 tests_testLookupTable_LDADD = \
        base/libbase.la \
+       sbuf/libsbuf.la \
        $(SQUID_CPPUNIT_LIBS) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)

diff --git a/src/SBufDetailedStats.h b/src/SBufDetailedStats.h
index 86761c1cb948d095ab0e7ce28a2a672385e3ebcf..f5bc27f819a64e447f344774706334decfa7b722 100644 (file)
--- a/src/SBufDetailedStats.h
+++ b/src/SBufDetailedStats.h
@@ -9,7 +9,7 @@
 #ifndef SQUID_SBUFDETAILEDSTATS_H
 #define SQUID_SBUFDETAILEDSTATS_H
 
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 class StatHist;
 

diff --git a/src/SBufStatsAction.h b/src/SBufStatsAction.h
index e64233afae0f3562a71e7b87269b705638e24bfe..2099fa78cb2b345d384e258693dca436113d29fe 100644 (file)
--- a/src/SBufStatsAction.h
+++ b/src/SBufStatsAction.h
@@ -10,7 +10,7 @@
 #define SQUID_SBUFEXTRAS_H
 
 #include "mgr/Action.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 #include "StatHist.h"
 
 class StoreEntry;

diff --git a/src/URL.h b/src/URL.h
index 02b7c58f7044e9ca66458e2d791c44aa82bdd1ca..7217663e3a02975aff6a006d9ff5122c85ae90f3 100644 (file)
--- a/src/URL.h
+++ b/src/URL.h
@@ -12,7 +12,7 @@
 #include "anyp/UriScheme.h"
 #include "ip/Address.h"
 #include "rfc2181.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 #include <iosfwd>
 

diff --git a/src/acl/Acl.h b/src/acl/Acl.h
index 698206a290b3a5927314ab259f853c9058f14d9d..bbd87ab83a548a69cfb66411cfc9f89aee7f4167 100644 (file)
--- a/src/acl/Acl.h
+++ b/src/acl/Acl.h
@@ -14,7 +14,7 @@
 #include "cbdata.h"
 #include "defines.h"
 #include "dlink.h"
-#include "SBufList.h"
+#include "sbuf/SBufList.h"
 
 #include <map>
 #include <ostream>

diff --git a/src/acl/Data.h b/src/acl/Data.h
index 17f3b8276f1ebee354f152bf18e49c0dab59f097..bfb917daa5b98de2f8b30748b2ccc9351165ceda 100644 (file)
--- a/src/acl/Data.h
+++ b/src/acl/Data.h
@@ -9,7 +9,7 @@
 #ifndef SQUID_ACLDATA_H
 #define SQUID_ACLDATA_H
 
-#include "SBufList.h"
+#include "sbuf/SBufList.h"
 
 /// \ingroup ACLAPI
 template <class M>

diff --git a/src/acl/HttpHeaderData.cc b/src/acl/HttpHeaderData.cc
index 5a8e275bf94d6aa2eb02a5d6a3bce491ab93aef3..9d4c661434be4d9efcc52b375090cd7cc1a17efc 100644 (file)
--- a/src/acl/HttpHeaderData.cc
+++ b/src/acl/HttpHeaderData.cc
@@ -17,7 +17,7 @@
 #include "ConfigParser.h"
 #include "Debug.h"
 #include "HttpHeaderTools.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 /* Construct an ACLHTTPHeaderData that uses an ACLRegex rule with the value of the
  * selected header from a given request.

diff --git a/src/acl/HttpHeaderData.h b/src/acl/HttpHeaderData.h
index 44143d393bfaacbc0d151d34ad326abb1ecacbdc..c5b91e8b7c3c352b0bd249774b1803d343f5fd93 100644 (file)
--- a/src/acl/HttpHeaderData.h
+++ b/src/acl/HttpHeaderData.h
@@ -11,7 +11,7 @@
 
 #include "acl/Data.h"
 #include "HttpHeader.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 #include "SquidString.h"
 
 class ACLHTTPHeaderData : public ACLData<HttpHeader*>

diff --git a/src/acl/StringData.h b/src/acl/StringData.h
index 60ca0dbbfa9a2744ce05f7168742e7bdc9a24fd8..77ac0cf2c6abbfbec01344752130c761e3a72efb 100644 (file)
--- a/src/acl/StringData.h
+++ b/src/acl/StringData.h
@@ -11,7 +11,7 @@
 
 #include "acl/Acl.h"
 #include "acl/Data.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 #include <set>
 

diff --git a/src/acl/Tree.h b/src/acl/Tree.h
index d9314d031bc9c7b32489969f144d2a80b0129eb3..28518f2f277d594b3a2da45e29e5807d57cec781 100644 (file)
--- a/src/acl/Tree.h
+++ b/src/acl/Tree.h
@@ -10,7 +10,7 @@
 #define SQUID_ACL_TREE_H
 
 #include "acl/BoolOps.h"
-#include "SBufList.h"
+#include "sbuf/SBufList.h"
 
 namespace Acl
 {

diff --git a/src/acl/UserData.cc b/src/acl/UserData.cc
index f5659f43c4ee7201a372e50904e2524859dec825..576cfebf68cf221b8a6a2753bf984746a662b4b6 100644 (file)
--- a/src/acl/UserData.cc
+++ b/src/acl/UserData.cc
@@ -14,7 +14,7 @@
 #include "ConfigParser.h"
 #include "Debug.h"
 #include "globals.h"
-#include "SBufAlgos.h"
+#include "sbuf/SBufAlgos.h"
 #include "util.h"
 
 bool

diff --git a/src/acl/UserData.h b/src/acl/UserData.h
index a3d24763593b37ef189f14dffafd732d34d0e499..d99b18e7d9cc7a2906a849e5f76f0a780a39268a 100644 (file)
--- a/src/acl/UserData.h
+++ b/src/acl/UserData.h
@@ -11,7 +11,7 @@
 
 #include "acl/Acl.h"
 #include "acl/Data.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 #include <set>
 

diff --git a/src/adaptation/History.h b/src/adaptation/History.h
index 9e34fde06a89a0398fd2997681ab2b1ece3516fe..5acb842e7982a69aa2ee6df645ed9554b2a5db29 100644 (file)
--- a/src/adaptation/History.h
+++ b/src/adaptation/History.h
@@ -13,7 +13,7 @@
 #include "base/RefCount.h"
 #include "HttpHeader.h"
 #include "Notes.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 #include "SquidString.h"
 
 namespace Adaptation

diff --git a/src/adaptation/icap/Xaction.h b/src/adaptation/icap/Xaction.h
index 0d2cf28cb059ac0424168f3f96ac11a1e5de8856..a562deb2225e3b87e3ca5b1485ffd8b3814405a5 100644 (file)
--- a/src/adaptation/icap/Xaction.h
+++ b/src/adaptation/icap/Xaction.h
@@ -15,7 +15,7 @@
 #include "comm/ConnOpener.h"
 #include "HttpReply.h"
 #include "ipcache.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 #if USE_OPENSSL
 #include "ssl/PeerConnector.h"
 #endif

diff --git a/src/anyp/PortCfg.h b/src/anyp/PortCfg.h
index 11ee74647eb7a74269c45ebe02955fc208e94d13..fc63a8e3692e230ba74ea71063a9ba5e0c4da285 100644 (file)
--- a/src/anyp/PortCfg.h
+++ b/src/anyp/PortCfg.h
@@ -13,7 +13,7 @@
 #include "anyp/ProtocolVersion.h"
 #include "anyp/TrafficMode.h"
 #include "comm/Connection.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 #include "security/ServerOptions.h"
 
 #if USE_OPENSSL

diff --git a/src/auth/CredentialsCache.h b/src/auth/CredentialsCache.h
index b5e42126af8bb7eb4bb920517f6037f0d472ef71..ff7b094b4bb3ea34f1ff31c560d04d1339191e16 100644 (file)
--- a/src/auth/CredentialsCache.h
+++ b/src/auth/CredentialsCache.h
@@ -11,7 +11,7 @@
 
 #include "auth/User.h"
 #include "cbdata.h"
-#include "SBufAlgos.h"
+#include "sbuf/SBufAlgos.h"
 
 #include <unordered_map>
 

diff --git a/src/auth/User.h b/src/auth/User.h
index d08422b6f7d47783609bc914a79d45231a442bda..30e738b49fa9a68c130c0152d91f58cac61a0836 100644 (file)
--- a/src/auth/User.h
+++ b/src/auth/User.h
@@ -18,7 +18,7 @@
 #include "dlink.h"
 #include "ip/Address.h"
 #include "Notes.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 class StoreEntry;
 

diff --git a/src/auth/digest/Config.cc b/src/auth/digest/Config.cc
index abe73a1e347b21f3b051ae468eb80d68aed58bb3..2d17acf3c03427df42ebcba4aac784619fd02ff9 100644 (file)
--- a/src/auth/digest/Config.cc
+++ b/src/auth/digest/Config.cc
@@ -30,7 +30,7 @@
 #include "HttpRequest.h"
 #include "mgr/Registration.h"
 #include "rfc2617.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 #include "SquidTime.h"
 #include "Store.h"
 #include "StrList.h"

diff --git a/src/base/LookupTable.h b/src/base/LookupTable.h
index 763cc538613ab3b67c03f54d6e13ef765976ac19..72190f317cd4a0538fe3daf72d97a8c8c8287c56 100644 (file)
--- a/src/base/LookupTable.h
+++ b/src/base/LookupTable.h
@@ -9,8 +9,8 @@
 #ifndef SQUID_LOOKUPTABLE_H_
 #define SQUID_LOOKUPTABLE_H_
 
-#include "SBuf.h"
-#include "SBufAlgos.h"
+#include "sbuf/SBuf.h"
+#include "sbuf/SBufAlgos.h"
 
 #include <unordered_map>
 

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 33bd63bd3a7dfb74ccaf0985757f020cc7a276fe..d45d95a55de8c28a357ae36acaa00ba1f960cbd6 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -52,7 +52,7 @@
 #include "redirect.h"
 #include "RefreshPattern.h"
 #include "rfc1738.h"
-#include "SBufList.h"
+#include "sbuf/SBufList.h"
 #include "SquidConfig.h"
 #include "SquidString.h"
 #include "ssl/ProxyCerts.h"

diff --git a/src/client_side.h b/src/client_side.h
index ec3b9a796bf0121547ea469228ff8e7d9c7b4add..fc7a7a0898dd9cb5371186e86379e99127a6b89e 100644 (file)
--- a/src/client_side.h
+++ b/src/client_side.h
@@ -18,7 +18,7 @@
 #include "http/forward.h"
 #include "HttpControlMsg.h"
 #include "ipc/FdNotes.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 #include "servers/Server.h"
 #if USE_AUTH
 #include "auth/UserRequest.h"

diff --git a/src/clients/FtpRelay.cc b/src/clients/FtpRelay.cc
index e0e7f58c14ba8344b75fd7892cc6210e63242c10..4cb3726490b396a1ec6fc488baa6240cece34cae 100644 (file)
--- a/src/clients/FtpRelay.cc
+++ b/src/clients/FtpRelay.cc
@@ -18,7 +18,7 @@
 #include "http/Stream.h"
 #include "HttpHdrCc.h"
 #include "HttpRequest.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 #include "servers/FtpServer.h"
 #include "SquidTime.h"
 #include "Store.h"

diff --git a/src/comm.cc b/src/comm.cc
index 212d6f64a7fcf0441fdcd306e1a3fe686d358711..e7b62176e1093f5727ddd48778a30a9ab74e4221 100644 (file)
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -31,7 +31,7 @@
 #include "ip/tools.h"
 #include "pconn.h"
 #include "profiler/Profiler.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 #include "SquidConfig.h"
 #include "StatCounters.h"
 #include "StoreIOBuffer.h"

diff --git a/src/comm/Read.cc b/src/comm/Read.cc
index 70e61238b114f19ee3e4a50c422b284ed4e70643..ffaefc8dc362f863543b046d22eb3f79687cb41a 100644 (file)
--- a/src/comm/Read.cc
+++ b/src/comm/Read.cc
@@ -18,7 +18,7 @@
 #include "Debug.h"
 #include "fd.h"
 #include "fde.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 #include "StatCounters.h"
 //#include "tools.h"
 

diff --git a/src/esi/CustomParser.h b/src/esi/CustomParser.h
index 565fbaa790be6bfb1277f4264416609df6493ee8..664aa3a78addb10652e0e8159269139d9a4565ac 100644 (file)
--- a/src/esi/CustomParser.h
+++ b/src/esi/CustomParser.h
@@ -14,7 +14,7 @@ class Trie;
 /* inherits from */
 #include "esi/Parser.h"
 
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 #include "SquidString.h"
 
 /**

diff --git a/src/fs/rock/RockIoState.h b/src/fs/rock/RockIoState.h
index 681e4b2fed4aa361597307d6b4f75eb4c2d280e5..69262067152542519c4e7a6de23a100b08f75267 100644 (file)
--- a/src/fs/rock/RockIoState.h
+++ b/src/fs/rock/RockIoState.h
@@ -10,7 +10,7 @@
 #define SQUID_FS_ROCK_IO_STATE_H
 
 #include "fs/rock/RockSwapDir.h"
-#include "MemBlob.h"
+#include "sbuf/MemBlob.h"
 
 class DiskFile;
 

diff --git a/src/ftp/Elements.cc b/src/ftp/Elements.cc
index cfee20df470e633581d0a84222d1752099ac04fd..64dac4a95a8daca21d71401d92df7e0d8699aee6 100644 (file)
--- a/src/ftp/Elements.cc
+++ b/src/ftp/Elements.cc
@@ -12,7 +12,7 @@
 #include "ftp/Elements.h"
 #include "HttpHdrCc.h"
 #include "HttpReply.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 // FTP does not have a notion of a "protocol version" but we need something for
 // compatibility with the current HttpMsg wrapping layer. We use version 1.1:

diff --git a/src/globals.h b/src/globals.h
index 29776474586640bc1c5d0e5944ae94e917f33dfd..3b3c962d2b4a111caea5554d2f0a73feaa0106f7 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -15,7 +15,7 @@
 #include "hash.h"
 #include "IoStats.h"
 #include "rfc2181.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 extern char *ConfigFile;    /* NULL */
 extern char *IcpOpcodeStr[];

diff --git a/src/helper.h b/src/helper.h
index 8d6e1d5a240fd476191305c7addecc12929bf62c..f531bca70bb0690fddca68042210b5829e9ab3a4 100644 (file)
--- a/src/helper.h
+++ b/src/helper.h
@@ -19,7 +19,7 @@
 #include "helper/ChildConfig.h"
 #include "helper/forward.h"
 #include "ip/Address.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 #include <list>
 #include <map>

diff --git a/src/http/MethodType.h b/src/http/MethodType.h
index 6ec9c9a4e714e23d8343740a860a510778681ec0..d8f661887b2c9e1bacfb318686da632d9e546691 100644 (file)
--- a/src/http/MethodType.h
+++ b/src/http/MethodType.h
@@ -9,7 +9,7 @@
 #ifndef SQUID_SRC_HTTP_METHODTYPE_H
 #define SQUID_SRC_HTTP_METHODTYPE_H
 
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 namespace Http
 {

diff --git a/src/http/RequestMethod.h b/src/http/RequestMethod.h
index 028f4633975ee5fa02a6337a8d8869a09eabc50c..d6e0b664f011bad43fc349a4aa81b8de5a849805 100644 (file)
--- a/src/http/RequestMethod.h
+++ b/src/http/RequestMethod.h
@@ -11,7 +11,7 @@
 
 #include "http/forward.h"
 #include "http/MethodType.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 class SquidConfig;
 

diff --git a/src/http/one/Parser.h b/src/http/one/Parser.h
index ff4d1c6685f2607fd9cb8037e0db161516eb8c64..abe30a245cc3fbeafeaff319d3adbd344c3627df 100644 (file)
--- a/src/http/one/Parser.h
+++ b/src/http/one/Parser.h
@@ -12,7 +12,7 @@
 #include "anyp/ProtocolVersion.h"
 #include "http/one/forward.h"
 #include "http/StatusCode.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 namespace Http {
 namespace One {

diff --git a/src/icmp/IcmpConfig.h b/src/icmp/IcmpConfig.h
index 7e5331656d5a772bca63dd9e5539a2c29f44db34..4cd6b9d98cedbff92ab07c034b080cdb41ad6f37 100644 (file)
--- a/src/icmp/IcmpConfig.h
+++ b/src/icmp/IcmpConfig.h
@@ -14,7 +14,7 @@
 #if USE_ICMP
 
 #include "cache_cf.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 /**
  * Squid pinger Configuration settings

diff --git a/src/ipc/MemMap.h b/src/ipc/MemMap.h
index 4fb9a1de092d76d9a078fa86ef96d4be05965359..18437e5de91245569cb17f7c6b763fe6649f8e66 100644 (file)
--- a/src/ipc/MemMap.h
+++ b/src/ipc/MemMap.h
@@ -13,7 +13,7 @@
 #include "ipc/mem/FlexibleArray.h"
 #include "ipc/mem/Pointer.h"
 #include "ipc/ReadWriteLock.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 #include "store/forward.h"
 #include "store_key_md5.h"
 #include "tools.h"

diff --git a/src/ipc/StoreMap.cc b/src/ipc/StoreMap.cc
index 105b1c6eda2f5a715649df29342100f1f0a0be0d..9c39f398e26a9a957859d482e9f2e13ad00ec842 100644 (file)
--- a/src/ipc/StoreMap.cc
+++ b/src/ipc/StoreMap.cc
@@ -10,7 +10,7 @@
 
 #include "squid.h"
 #include "ipc/StoreMap.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 #include "Store.h"
 #include "store_key_md5.h"
 #include "tools.h"

diff --git a/src/ipc/StoreMap.h b/src/ipc/StoreMap.h
index 6494cdec0c775cd558c0271298369320fcc5aa74..c53d4209a283883244b25286407b6575d8f52884 100644 (file)
--- a/src/ipc/StoreMap.h
+++ b/src/ipc/StoreMap.h
@@ -12,7 +12,7 @@
 #include "ipc/mem/FlexibleArray.h"
 #include "ipc/mem/Pointer.h"
 #include "ipc/ReadWriteLock.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 #include "store/forward.h"
 #include "store_key_md5.h"
 

diff --git a/src/ipc/mem/Segment.cc b/src/ipc/mem/Segment.cc
index dfc363d7de1b88bd838522ed2c7e1a75ace9a3f0..289a2dff45f18379cf7d8a6dcf92b813a602b4e7 100644 (file)
--- a/src/ipc/mem/Segment.cc
+++ b/src/ipc/mem/Segment.cc
@@ -14,7 +14,7 @@
 #include "Debug.h"
 #include "fatal.h"
 #include "ipc/mem/Segment.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 #include "tools.h"
 
 #if HAVE_FCNTL_H

diff --git a/src/log/TcpLogger.cc b/src/log/TcpLogger.cc
index dfa96f28a98229b9843d550fcb7ed1d8a1af1df2..a757e329ba042f752e3a5af00de863259993e7a3 100644 (file)
--- a/src/log/TcpLogger.cc
+++ b/src/log/TcpLogger.cc
@@ -18,7 +18,7 @@
 #include "log/CustomLog.h"
 #include "log/File.h"
 #include "log/TcpLogger.h"
-#include "MemBlob.h"
+#include "sbuf/MemBlob.h"
 #include "Parsing.h"
 #include "SquidConfig.h"
 #include "SquidTime.h"

diff --git a/src/parser/Tokenizer.h b/src/parser/Tokenizer.h
index 079d67c71c420d698bccb439105c3c53350d7e5e..49917e4312294e650a94e64f09ef1ca6ddfca628 100644 (file)
--- a/src/parser/Tokenizer.h
+++ b/src/parser/Tokenizer.h
@@ -10,7 +10,7 @@
 #define SQUID_PARSER_TOKENIZER_H_
 
 #include "base/CharacterSet.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 /// Generic protocol-agnostic parsing tools
 namespace Parser

diff --git a/src/redirect.cc b/src/redirect.cc
index d62089eabf69b794c07357b1d2653917cd91d03b..c6bffaa5439272a962f2148dc4e5f1e5e8d0b899 100644 (file)
--- a/src/redirect.cc
+++ b/src/redirect.cc
@@ -25,7 +25,7 @@
 #include "mgr/Registration.h"
 #include "redirect.h"
 #include "rfc1738.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 #include "SquidConfig.h"
 #include "Store.h"
 #if USE_AUTH

diff --git a/src/sbuf/Makefile.am b/src/sbuf/Makefile.am
new file mode 100644 (file)
index 0000000..5e0bae5
--- /dev/null
+++ b/src/sbuf/Makefile.am
@@ -0,0 +1,26 @@
+## Copyright (C) 1996-2016 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
+
+include $(top_srcdir)/src/Common.am
+include $(top_srcdir)/src/TestHeaders.am
+
+noinst_LTLIBRARIES = libsbuf.la
+
+libsbuf_la_SOURCES = \
+       ../base/CharacterSet.h \
+       MemBlob.cc \
+       MemBlob.h \
+       OutOfBoundsException.h \
+       SBuf.cc \
+       SBuf.h \
+       SBufAlgos.cc \
+       SBufAlgos.h \
+       SBufExceptions.cc \
+       SBufExceptions.h \
+       SBufList.cc \
+       SBufList.h \
+       SBufStream.h
\ No newline at end of file

diff --git a/src/MemBlob.cc b/src/sbuf/MemBlob.cc
similarity index 99%
rename from src/MemBlob.cc
rename to src/sbuf/MemBlob.cc
index 2e1ff92426b19c31bbf4db383860eb2ad996a6e5..b488eafbe191e8add96154279e81891591cd7e7a 100644 (file)
--- a/src/MemBlob.cc
+++ b/src/sbuf/MemBlob.cc
@@ -9,7 +9,7 @@
 #include "squid.h"
 #include "base/TextException.h"
 #include "Debug.h"
-#include "MemBlob.h"
+#include "sbuf/MemBlob.h"
 #include "SBufDetailedStats.h"
 
 #include <iostream>

diff --git a/src/MemBlob.h b/src/sbuf/MemBlob.h
similarity index 100%
rename from src/MemBlob.h
rename to src/sbuf/MemBlob.h

diff --git a/src/OutOfBoundsException.h b/src/sbuf/OutOfBoundsException.h
similarity index 97%
rename from src/OutOfBoundsException.h
rename to src/sbuf/OutOfBoundsException.h
index e3995dc2b45906fec457594fb647f1bfa44fbdb6..a2545a7189c2f5f0691eb5c196bccb04a9e18e1c 100644 (file)
--- a/src/OutOfBoundsException.h
+++ b/src/sbuf/OutOfBoundsException.h
@@ -10,7 +10,7 @@
 #define _SQUID_SRC_OUTOFBOUNDSEXCEPTION_H
 
 #include "base/TextException.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 /**
  * Exception raised when the user is going out of bounds when accessing

diff --git a/src/SBuf.cc b/src/sbuf/SBuf.cc
similarity index 100%
rename from src/SBuf.cc
rename to src/sbuf/SBuf.cc

diff --git a/src/SBuf.h b/src/sbuf/SBuf.h
similarity index 99%
rename from src/SBuf.h
rename to src/sbuf/SBuf.h
index 68c8afc37b2e11ce6eeeb323af47c41c763a233c..8bb77ab8ab7e87bef11d1b33b4a1986ef67dee62 100644 (file)
--- a/src/SBuf.h
+++ b/src/sbuf/SBuf.h
@@ -14,7 +14,7 @@
 #include "base/InstanceId.h"
 #include "Debug.h"
 #include "globals.h"
-#include "MemBlob.h"
+#include "sbuf/MemBlob.h"
 #include "SBufExceptions.h"
 #include "SquidString.h"
 

diff --git a/src/SBufAlgos.cc b/src/sbuf/SBufAlgos.cc
similarity index 100%
rename from src/SBufAlgos.cc
rename to src/sbuf/SBufAlgos.cc

diff --git a/src/SBufAlgos.h b/src/sbuf/SBufAlgos.h
similarity index 100%
rename from src/SBufAlgos.h
rename to src/sbuf/SBufAlgos.h

diff --git a/src/SBufExceptions.cc b/src/sbuf/SBufExceptions.cc
similarity index 100%
rename from src/SBufExceptions.cc
rename to src/sbuf/SBufExceptions.cc

diff --git a/src/SBufExceptions.h b/src/sbuf/SBufExceptions.h
similarity index 100%
rename from src/SBufExceptions.h
rename to src/sbuf/SBufExceptions.h

diff --git a/src/SBufList.cc b/src/sbuf/SBufList.cc
similarity index 100%
rename from src/SBufList.cc
rename to src/sbuf/SBufList.cc

diff --git a/src/SBufList.h b/src/sbuf/SBufList.h
similarity index 100%
rename from src/SBufList.h
rename to src/sbuf/SBufList.h

diff --git a/src/SBufStream.h b/src/sbuf/SBufStream.h
similarity index 100%
rename from src/SBufStream.h
rename to src/sbuf/SBufStream.h

diff --git a/src/security/KeyData.h b/src/security/KeyData.h
index 6f33692847fdd2071c0c434d4fa462d3dfa385c6..1aa8f7d0d2efe149f1eef77f7f2881118c3b4f41 100644 (file)
--- a/src/security/KeyData.h
+++ b/src/security/KeyData.h
@@ -9,7 +9,7 @@
 #ifndef SQUID_SRC_SECURITY_KEYDATA_H
 #define SQUID_SRC_SECURITY_KEYDATA_H
 
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 #include "security/forward.h"
 
 namespace Security

diff --git a/src/servers/Server.h b/src/servers/Server.h
index e9bfbf314635d0e4291dd82dc1aa1b0292f567aa..0d2832fc039424f2f35b5b89eedca1b40697b492 100644 (file)
--- a/src/servers/Server.h
+++ b/src/servers/Server.h
@@ -18,7 +18,7 @@
 #include "comm/Write.h"
 #include "CommCalls.h"
 #include "Pipeline.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 /**
  * Common base for all Server classes used

diff --git a/src/ssl/bio.h b/src/ssl/bio.h
index df2d926cb180d6fd586cc505fa9852bb376e9bec..c8f537a15972e8095abfe9e7eef77220f2847b60 100644 (file)
--- a/src/ssl/bio.h
+++ b/src/ssl/bio.h
@@ -10,7 +10,7 @@
 #define SQUID_SSL_BIO_H
 
 #include "fd.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 #include <iosfwd>
 #include <list>

diff --git a/src/ssl/support.h b/src/ssl/support.h
index 2ece667acd1d7b5a13c6c277eecb17b444d2edf5..b54828693f527bb87c7a168ad93ba1b9707127a3 100644 (file)
--- a/src/ssl/support.h
+++ b/src/ssl/support.h
@@ -14,7 +14,7 @@
 #if USE_OPENSSL
 
 #include "base/CbDataList.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 #include "security/forward.h"
 #include "ssl/gadgets.h"
 

diff --git a/src/tests/SBufFindTest.h b/src/tests/SBufFindTest.h
index ffe9c4a8f27a91475c659aca047e76998200ac50..7f28b03cf87995912a01c33f0bfe084b49afa5b5 100644 (file)
--- a/src/tests/SBufFindTest.h
+++ b/src/tests/SBufFindTest.h
@@ -9,7 +9,7 @@
 #ifndef SQUID_SRC_TEST_SBUFFINDTEST_H
 #define SQUID_SRC_TEST_SBUFFINDTEST_H
 
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 #include <set>
 #include <string>

diff --git a/src/tests/stub_SBuf.cc b/src/tests/stub_SBuf.cc
index 3a703c78387389a246e0d4f349bae810ac407c27..6be715719c5058b0380c5720b633c5b87241adfd 100644 (file)
--- a/src/tests/stub_SBuf.cc
+++ b/src/tests/stub_SBuf.cc
@@ -11,7 +11,7 @@
 #define STUB_API "SBuf.cc"
 #include "tests/STUB.h"
 
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 InstanceIdDefinitions(SBuf, "SBuf");
 

diff --git a/src/tests/stub_SBufDetailedStats.cc b/src/tests/stub_SBufDetailedStats.cc
index 59ff33a307e09cfc156c4378fd4c52249705544d..7d552822d8699deb4fe5b63366dbb33f394b92b3 100644 (file)
--- a/src/tests/stub_SBufDetailedStats.cc
+++ b/src/tests/stub_SBufDetailedStats.cc
@@ -7,7 +7,7 @@
  */
 
 #include "squid.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 #define STUB_API "SBufDetailedStats.cc"
 #include "tests/STUB.h"

diff --git a/src/tests/testSBuf.cc b/src/tests/testSBuf.cc
index bc092a668dcd22294abbddabe3b23d039b5e59a5..0b896e3520f226ee90ef7701e21ec42aa04cb877 100644 (file)
--- a/src/tests/testSBuf.cc
+++ b/src/tests/testSBuf.cc
@@ -8,10 +8,10 @@
 
 #include "squid.h"
 #include "base/CharacterSet.h"
-#include "SBuf.h"
-#include "SBufAlgos.h"
+#include "sbuf/SBuf.h"
+#include "sbuf/SBufAlgos.h"
 #include "SBufFindTest.h"
-#include "SBufStream.h"
+#include "sbuf/SBufStream.h"
 #include "SquidString.h"
 #include "testSBuf.h"
 #include "unitTestMain.h"

diff --git a/src/tests/testSBuf.h b/src/tests/testSBuf.h
index bc935598fbaa8ac9b2a67918073db6ffee810589..40e8d0774fff4be68e3cc5c96c436b110a2ecee4 100644 (file)
--- a/src/tests/testSBuf.h
+++ b/src/tests/testSBuf.h
@@ -11,7 +11,7 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 
-#include "OutOfBoundsException.h"
+#include "sbuf/OutOfBoundsException.h"
 
 /*
  * test the SBuf functionalities

diff --git a/src/tests/testSBufList.cc b/src/tests/testSBufList.cc
index 4af14664f3cdf4d2d8b95ed912d94ad75d561297..21f71b27228aed257c07f10371a159000670b2d8 100644 (file)
--- a/src/tests/testSBufList.cc
+++ b/src/tests/testSBufList.cc
@@ -7,8 +7,8 @@
  */
 
 #include "squid.h"
-#include "SBufAlgos.h"
-#include "SBufList.h"
+#include "sbuf/SBufAlgos.h"
+#include "sbuf/SBufList.h"
 #include "testSBufList.h"
 #include "unitTestMain.h"
 

diff --git a/src/tests/testSBufList.h b/src/tests/testSBufList.h
index 2ecd268f46f931287b8af477169d4eeffd19d08f..1ff6013b9205e587f7349d83f85529e845b74369 100644 (file)
--- a/src/tests/testSBufList.h
+++ b/src/tests/testSBufList.h
@@ -11,7 +11,7 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 
-#include "OutOfBoundsException.h"
+#include "sbuf/OutOfBoundsException.h"
 
 class testSBufList : public CPPUNIT_NS::TestFixture
 {

diff --git a/src/tools.h b/src/tools.h
index e438387e554a3e7363fbff6d2f2de83d05563da9..9626def6b65d338a24b24d96da00554f1f1c8646 100644 (file)
--- a/src/tools.h
+++ b/src/tools.h
@@ -11,7 +11,7 @@
 #ifndef SQUID_TOOLS_H_
 #define SQUID_TOOLS_H_
 
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 #include "typedefs.h"
 
 class MemBuf;

diff --git a/src/tunnel.cc b/src/tunnel.cc
index a38a69af982f4dcd91545858b7949294caa4528b..3656619126f383457f37f8046735cd6149bf04da 100644 (file)
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -32,7 +32,7 @@
 #include "LogTags.h"
 #include "MemBuf.h"
 #include "PeerSelectState.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 #include "SquidConfig.h"
 #include "SquidTime.h"
 #include "ssl/BlindPeerConnector.h"

diff --git a/src/wordlist.h b/src/wordlist.h
index fa8b38610ea031ebb811f95ee099050cdfb77bac..42363a36f99d22dbf8c418cc446064d77a849bef 100644 (file)
--- a/src/wordlist.h
+++ b/src/wordlist.h
@@ -11,7 +11,7 @@
 
 #include "globals.h"
 #include "profiler/Profiler.h"
-#include "SBufList.h"
+#include "sbuf/SBufList.h"
 
 /** A list of C-strings
  *
@@ -48,7 +48,7 @@ const char *wordlistAdd(wordlist **, const char *);
 
 /** Concatenate a wordlist
  *
- * \deprecated use SBufListContainerJoin(SBuf()) from SBufAlgos.h instead
+ * \deprecated use SBufListContainerJoin(SBuf()) from sbuf/SBufAlgos.h instead
  */
 void wordlistCat(const wordlist *, MemBuf *);
 
@@ -60,7 +60,7 @@ void wordlistAddWl(wordlist **, wordlist *);
 
 /** Concatenate the words in a wordlist
  *
- * \deprecated use SBufListContainerJoin(SBuf()) from SBufAlgos.h instead
+ * \deprecated use SBufListContainerJoin(SBuf()) from sbuf/SBufAlgos.h instead
  */
 void wordlistJoin(wordlist **, wordlist **);