Merged from trunk

diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc
index e7890f90c13405b5cf6181be92ad98799c43e29d..272ed0ebd0b06a6981100a0ba96b8f56f09af48b 100644 (file)
--- a/src/HttpRequest.cc
+++ b/src/HttpRequest.cc
@@ -25,7 +25,7 @@
 #include "HttpRequest.h"
 #include "log/Config.h"
 #include "MemBuf.h"
-#include "sbuf/SBufStringConvert.h"
+#include "sbuf/StringConvert.h"
 #include "SquidConfig.h"
 #include "Store.h"
 #include "URL.h"

diff --git a/src/Makefile.am b/src/Makefile.am
index e5ffcaebfcc4854db9a9af677d907fd88cde5820..5de5f6c07ca2359f249f0db0706c3364d22f6a2c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -412,7 +412,7 @@ squid_SOURCES = \
        send-announce.cc \
        SBufStatsAction.h \
        SBufStatsAction.cc \
-       sbuf/SBufStringConvert.h \
+       sbuf/StringConvert.h \
        $(SNMP_SOURCE) \
        SquidMath.h \
        SquidMath.cc \

diff --git a/src/SBufStatsAction.cc b/src/SBufStatsAction.cc
index e10366eca46ee7f21e7910a260ace0fc4fda9e42..296c9e390f1f0ac9e1720e0f64547990e754d8b0 100644 (file)
--- a/src/SBufStatsAction.cc
+++ b/src/SBufStatsAction.cc
@@ -11,7 +11,7 @@
 #include "ipc/Messages.h"
 #include "ipc/TypedMsgHdr.h"
 #include "mgr/Registration.h"
-#include "sbuf/SBufDetailedStats.h"
+#include "sbuf/DetailedStats.h"
 #include "SBufStatsAction.h"
 
 SBufStatsAction::SBufStatsAction(const Mgr::CommandPointer &cmd_):

diff --git a/src/acl/HttpHeaderData.cc b/src/acl/HttpHeaderData.cc
index 2903eb9f361e5179cf82af010da7df7e2595a4d2..52dbf162bf27b7cbb205a103c3372f0b0892bcad 100644 (file)
--- a/src/acl/HttpHeaderData.cc
+++ b/src/acl/HttpHeaderData.cc
@@ -18,7 +18,7 @@
 #include "Debug.h"
 #include "HttpHeaderTools.h"
 #include "sbuf/SBuf.h"
-#include "sbuf/SBufStringConvert.h"
+#include "sbuf/StringConvert.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/Note.cc b/src/acl/Note.cc
index 35e43318f41b270e91707c8e11851658be20029b..4b96ad7c7bfda630e41fd46636ea11a7831883fa 100644 (file)
--- a/src/acl/Note.cc
+++ b/src/acl/Note.cc
@@ -14,7 +14,7 @@
 #include "HttpRequest.h"
 #include "Notes.h"
 #include "parser/Tokenizer.h"
-#include "sbuf/SBufStringConvert.h"
+#include "sbuf/StringConvert.h"
 
 int
 ACLNoteStrategy::match(ACLData<MatchType> * &data, ACLFilledChecklist *checklist, ACLFlags &flags)

diff --git a/src/acl/NoteData.cc b/src/acl/NoteData.cc
index d65b1f2534b099f83e34c958e34a7fba4ab3ea80..25c5ff1f40fbbaea8dfcd03a84e8321272b7fa6e 100644 (file)
--- a/src/acl/NoteData.cc
+++ b/src/acl/NoteData.cc
@@ -13,7 +13,7 @@
 #include "acl/StringData.h"
 #include "ConfigParser.h"
 #include "Debug.h"
-#include "sbuf/SBufStringConvert.h"
+#include "sbuf/StringConvert.h"
 #include "wordlist.h"
 
 ACLNoteData::ACLNoteData() : values(new ACLStringData)

diff --git a/src/acl/UserData.cc b/src/acl/UserData.cc
index 576cfebf68cf221b8a6a2753bf984746a662b4b6..a139d3cde0a82007b50914a4fedf61444f439b14 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 "sbuf/SBufAlgos.h"
+#include "sbuf/Algorithms.h"
 #include "util.h"
 
 bool

diff --git a/src/adaptation/Iterator.cc b/src/adaptation/Iterator.cc
index 7cfa060f8fe92c58ab84b7e488241e89e1c5e10c..b2565dc8bbd2f45470c796804588348579199ae6 100644 (file)
--- a/src/adaptation/Iterator.cc
+++ b/src/adaptation/Iterator.cc
@@ -19,7 +19,7 @@
 #include "HttpMsg.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
-#include "sbuf/SBufStringConvert.h"
+#include "sbuf/StringConvert.h"
 
 Adaptation::Iterator::Iterator(
     HttpMsg *aMsg, HttpRequest *aCause,

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

diff --git a/src/base/LookupTable.h b/src/base/LookupTable.h
index 72190f317cd4a0538fe3daf72d97a8c8c8287c56..a576177945ca2687f555d8284f6fec1e2cc7c893 100644 (file)
--- a/src/base/LookupTable.h
+++ b/src/base/LookupTable.h
@@ -10,7 +10,7 @@
 #define SQUID_LOOKUPTABLE_H_
 
 #include "sbuf/SBuf.h"
-#include "sbuf/SBufAlgos.h"
+#include "sbuf/Algorithms.h"
 
 #include <unordered_map>
 

diff --git a/src/mgr/ActionParams.cc b/src/mgr/ActionParams.cc
index 7cf84217146d87cf5fa209d25cc9b537a76e2854..5d91376440843d33c89afc729feb8d1dcc63323b 100644 (file)
--- a/src/mgr/ActionParams.cc
+++ b/src/mgr/ActionParams.cc
@@ -12,7 +12,7 @@
 #include "base/TextException.h"
 #include "ipc/TypedMsgHdr.h"
 #include "mgr/ActionParams.h"
-#include "sbuf/SBufStringConvert.h"
+#include "sbuf/StringConvert.h"
 
 Mgr::ActionParams::ActionParams(): httpMethod(Http::METHOD_NONE)
 {

diff --git a/src/sbuf/SBufAlgos.cc b/src/sbuf/Algorithms.cc
similarity index 97%
rename from src/sbuf/SBufAlgos.cc
rename to src/sbuf/Algorithms.cc
index cfa75cbda9df99ee7405fa286672ddf048a3fd8e..8f2fae86011ab9773225aa147020c6100eea2d99 100644 (file)
--- a/src/sbuf/SBufAlgos.cc
+++ b/src/sbuf/Algorithms.cc
@@ -7,7 +7,7 @@
  */
 
 #include "squid.h"
-#include "SBufAlgos.h"
+#include "sbuf/Algorithms.h"
 
 // private common implementation for SBuf hash variants
 static std::size_t

diff --git a/src/sbuf/SBufAlgos.h b/src/sbuf/Algorithms.h
similarity index 99%
rename from src/sbuf/SBufAlgos.h
rename to src/sbuf/Algorithms.h
index 8655db07074e6613b1feedf78431ee39b580a154..e65284851aadedd9b0443c778a9c279317df7483 100644 (file)
--- a/src/sbuf/SBufAlgos.h
+++ b/src/sbuf/Algorithms.h
@@ -9,7 +9,7 @@
 #ifndef SQUID_SBUFALGOS_H_
 #define SQUID_SBUFALGOS_H_
 
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 #include <algorithm>
 #include <numeric>

diff --git a/src/sbuf/SBufDetailedStats.cc b/src/sbuf/DetailedStats.cc
similarity index 97%
rename from src/sbuf/SBufDetailedStats.cc
rename to src/sbuf/DetailedStats.cc
index d5f7471422a9344c318698c1e9c93d20127f2121..3d1a181b1bb30615bfc6ebaed44d51a3fe70186c 100644 (file)
--- a/src/sbuf/SBufDetailedStats.cc
+++ b/src/sbuf/DetailedStats.cc
@@ -7,7 +7,7 @@
  */
 
 #include "squid.h"
-#include "SBufDetailedStats.h"
+#include "sbuf/DetailedStats.h"
 #include "StatHist.h"
 
 /*

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

diff --git a/src/sbuf/SBufExceptions.cc b/src/sbuf/Exceptions.cc
similarity index 94%
rename from src/sbuf/SBufExceptions.cc
rename to src/sbuf/Exceptions.cc
index 8fdeeb13addae261f49e98a548e0e460c1cea718..2c7a4ef7e1fc0fc11de4746128cede0490f2f5ee 100644 (file)
--- a/src/sbuf/SBufExceptions.cc
+++ b/src/sbuf/Exceptions.cc
@@ -7,9 +7,9 @@
  */
 
 #include "squid.h"
-#include "OutOfBoundsException.h"
-#include "SBuf.h"
-#include "SBufExceptions.h"
+#include "sbuf/OutOfBoundsException.h"
+#include "sbuf/SBuf.h"
+#include "sbuf/Exceptions.h"
 
 OutOfBoundsException::OutOfBoundsException(const SBuf &throwingBuf,
         SBuf::size_type &pos,

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

diff --git a/src/sbuf/Makefile.am b/src/sbuf/Makefile.am
index e42c1e29b7f1e60e5526e2efb41c49410c4437cf..b2d1392c283b80afa1c482631174cb479e9ac610 100644 (file)
--- a/src/sbuf/Makefile.am
+++ b/src/sbuf/Makefile.am
@@ -16,12 +16,12 @@ libsbuf_la_SOURCES = \
        OutOfBoundsException.h \
        SBuf.cc \
        SBuf.h \
-       SBufAlgos.cc \
-       SBufAlgos.h \
-       SBufDetailedStats.cc \
-       SBufDetailedStats.h \
-       SBufExceptions.cc \
-       SBufExceptions.h \
+       Algorithms.cc \
+       Algorithms.h \
+       DetailedStats.cc \
+       DetailedStats.h \
+       Exceptions.cc \
+       Exceptions.h \
        SBufList.cc \
        SBufList.h \
        SBufStream.h \

diff --git a/src/sbuf/MemBlob.cc b/src/sbuf/MemBlob.cc
index b488eafbe191e8add96154279e81891591cd7e7a..911a9d91b1cea18881f541a239d3c1879245a6ef 100644 (file)
--- a/src/sbuf/MemBlob.cc
+++ b/src/sbuf/MemBlob.cc
@@ -10,7 +10,7 @@
 #include "base/TextException.h"
 #include "Debug.h"
 #include "sbuf/MemBlob.h"
-#include "SBufDetailedStats.h"
+#include "sbuf/DetailedStats.h"
 
 #include <iostream>
 

diff --git a/src/sbuf/SBuf.cc b/src/sbuf/SBuf.cc
index 1d2ea44c9ad67caa0f7c0c55b6998d7ca57cc7f1..0523a47413bd18da82ab28d0a284bbab7b2774ff 100644 (file)
--- a/src/sbuf/SBuf.cc
+++ b/src/sbuf/SBuf.cc
@@ -10,10 +10,10 @@
 #include "base/CharacterSet.h"
 #include "base/RefCount.h"
 #include "Debug.h"
-#include "OutOfBoundsException.h"
-#include "SBuf.h"
-#include "SBufDetailedStats.h"
-#include "SBufExceptions.h"
+#include "sbuf/OutOfBoundsException.h"
+#include "sbuf/SBuf.h"
+#include "sbuf/DetailedStats.h"
+#include "sbuf/Exceptions.h"
 #include "util.h"
 
 #include <cstring>

diff --git a/src/sbuf/SBuf.h b/src/sbuf/SBuf.h
index b0aa872d2898e08b0b7c099364724ffbba8a7d31..b9733dc03341c94d79ff1f3abd7aaad9aa7a54e6 100644 (file)
--- a/src/sbuf/SBuf.h
+++ b/src/sbuf/SBuf.h
@@ -16,7 +16,7 @@
 #include "globals.h"
 #include "sbuf/MemBlob.h"
 #include "sbuf/Stats.h"
-#include "SBufExceptions.h"
+#include "sbuf/Exceptions.h"
 
 #include <climits>
 #include <cstdarg>

diff --git a/src/sbuf/SBufList.cc b/src/sbuf/SBufList.cc
index bc721113c8b9a79bc1d99c34e80c64907059c03a..2c871836466a4b3e5728100b2df55095ad7dfe29 100644 (file)
--- a/src/sbuf/SBufList.cc
+++ b/src/sbuf/SBufList.cc
@@ -7,8 +7,8 @@
  */
 
 #include "squid.h"
-#include "SBufAlgos.h"
-#include "SBufList.h"
+#include "sbuf/Algorithms.h"
+#include "sbuf/SBufList.h"
 
 bool
 IsMember(const SBufList & sl, const SBuf &S, const SBufCaseSensitive case_sensitive)

diff --git a/src/sbuf/SBufList.h b/src/sbuf/SBufList.h
index d29879aa922aa9d37434ca36e80063723bffb263..68babba2a958edee90b12c9ac8b34f70e7469055 100644 (file)
--- a/src/sbuf/SBufList.h
+++ b/src/sbuf/SBufList.h
@@ -9,7 +9,7 @@
 #ifndef SQUID_SBUFLIST_H
 #define SQUID_SBUFLIST_H
 
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 #include <list>
 

diff --git a/src/sbuf/SBufStream.h b/src/sbuf/SBufStream.h
index ce944fc710ad1ae49621cb67fcafb1c47f254a44..1eeaf8f2f8beaadd7eee01bfbb7437774636dd34 100644 (file)
--- a/src/sbuf/SBufStream.h
+++ b/src/sbuf/SBufStream.h
@@ -9,7 +9,7 @@
 #ifndef SQUID_SBUFSTREAM_H
 #define SQUID_SBUFSTREAM_H
 
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 #include <ostream>
 

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

diff --git a/src/tests/stub_SBufDetailedStats.cc b/src/tests/stub_SBufDetailedStats.cc
index 17a228347807eab45827119a8572dc121e3f4dac..0290de2aa86ebca490859df10dddf54e336dac72 100644 (file)
--- a/src/tests/stub_SBufDetailedStats.cc
+++ b/src/tests/stub_SBufDetailedStats.cc
@@ -9,7 +9,7 @@
 #include "squid.h"
 #include "sbuf/SBuf.h"
 
-#define STUB_API "SBufDetailedStats.cc"
+#define STUB_API "sbuf/DetailedStats.cc"
 #include "tests/STUB.h"
 
 class StatHist;

diff --git a/src/tests/testSBuf.cc b/src/tests/testSBuf.cc
index b0140706248b1c2d41efef41ad2b48b7336b4729..feb9e9ba1ef2222d2731f42961454d006b77165d 100644 (file)
--- a/src/tests/testSBuf.cc
+++ b/src/tests/testSBuf.cc
@@ -9,7 +9,7 @@
 #include "squid.h"
 #include "base/CharacterSet.h"
 #include "sbuf/SBuf.h"
-#include "sbuf/SBufAlgos.h"
+#include "sbuf/Algorithms.h"
 #include "sbuf/SBufStream.h"
 #include "tests/SBufFindTest.h"
 #include "tests/testSBuf.h"

diff --git a/src/tests/testSBufList.cc b/src/tests/testSBufList.cc
index 97b6ff280a9781aff74d68d8da6a589d650059d3..0a32d404b89079d2f74bb284c1ef2f586403678d 100644 (file)
--- a/src/tests/testSBufList.cc
+++ b/src/tests/testSBufList.cc
@@ -7,7 +7,7 @@
  */
 
 #include "squid.h"
-#include "sbuf/SBufAlgos.h"
+#include "sbuf/Algorithms.h"
 #include "sbuf/SBufList.h"
 #include "tests/testSBufList.h"
 #include "unitTestMain.h"

diff --git a/src/wordlist.h b/src/wordlist.h
index 42363a36f99d22dbf8c418cc446064d77a849bef..0a9a8c0de9c1531f27c0572a2a75471b37fc9c72 100644 (file)
--- a/src/wordlist.h
+++ b/src/wordlist.h
@@ -48,7 +48,7 @@ const char *wordlistAdd(wordlist **, const char *);
 
 /** Concatenate a wordlist
  *
- * \deprecated use SBufListContainerJoin(SBuf()) from sbuf/SBufAlgos.h instead
+ * \deprecated use SBufListContainerJoin(SBuf()) from sbuf/Algorithms.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 sbuf/SBufAlgos.h instead
+ * \deprecated use SBufListContainerJoin(SBuf()) from sbuf/Algorithms.h instead
  */
 void wordlistJoin(wordlist **, wordlist **);