Rename sbuf/SBufList and sbuf/SBufStream

diff --git a/src/acl/Acl.h b/src/acl/Acl.h
index bbd87ab83a548a69cfb66411cfc9f89aee7f4167..f99867acc97c86516d5582ff3abfb3799ff90469 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 "sbuf/SBufList.h"
+#include "sbuf/List.h"
 
 #include <map>
 #include <ostream>

diff --git a/src/acl/Data.h b/src/acl/Data.h
index bfb917daa5b98de2f8b30748b2ccc9351165ceda..e879288afc325a8ebd0e302fd134e4906e49045c 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 "sbuf/SBufList.h"
+#include "sbuf/List.h"
 
 /// \ingroup ACLAPI
 template <class M>

diff --git a/src/acl/Tree.h b/src/acl/Tree.h
index 28518f2f277d594b3a2da45e29e5807d57cec781..d507e0e7beb21cd629fc5eb4f9ee67ce478ca9c8 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 "sbuf/SBufList.h"
+#include "sbuf/List.h"
 
 namespace Acl
 {

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index d45d95a55de8c28a357ae36acaa00ba1f960cbd6..40c6c41da21aad742176c33edcbbf637827dfe84 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 "sbuf/SBufList.h"
+#include "sbuf/List.h"
 #include "SquidConfig.h"
 #include "SquidString.h"
 #include "ssl/ProxyCerts.h"

diff --git a/src/sbuf/SBufList.cc b/src/sbuf/List.cc
similarity index 94%
rename from src/sbuf/SBufList.cc
rename to src/sbuf/List.cc
index 2c871836466a4b3e5728100b2df55095ad7dfe29..ae7ff0bd866400dbc445219ccf78b7d24f37895d 100644 (file)
--- a/src/sbuf/SBufList.cc
+++ b/src/sbuf/List.cc
@@ -8,7 +8,7 @@
 
 #include "squid.h"
 #include "sbuf/Algorithms.h"
-#include "sbuf/SBufList.h"
+#include "sbuf/List.h"
 
 bool
 IsMember(const SBufList & sl, const SBuf &S, const SBufCaseSensitive case_sensitive)

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

diff --git a/src/sbuf/Makefile.am b/src/sbuf/Makefile.am
index b2d1392c283b80afa1c482631174cb479e9ac610..8b06dfc8d1c86b87986de0acd7bf6db0135cce8a 100644 (file)
--- a/src/sbuf/Makefile.am
+++ b/src/sbuf/Makefile.am
@@ -22,8 +22,8 @@ libsbuf_la_SOURCES = \
        DetailedStats.h \
        Exceptions.cc \
        Exceptions.h \
-       SBufList.cc \
-       SBufList.h \
-       SBufStream.h \
+       List.cc \
+       List.h \
+       Stream.h \
        Stats.cc \
        Stats.h

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

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

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

diff --git a/src/wordlist.h b/src/wordlist.h
index 0a9a8c0de9c1531f27c0572a2a75471b37fc9c72..0712bd418ef077474b2f2f5c56ffcf8bb685a038 100644 (file)
--- a/src/wordlist.h
+++ b/src/wordlist.h
@@ -11,7 +11,7 @@
 
 #include "globals.h"
 #include "profiler/Profiler.h"
-#include "sbuf/SBufList.h"
+#include "sbuf/List.h"
 
 /** A list of C-strings
  *