From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Tue, 1 Mar 2016 09:58:44 +0000 (+0100)
Subject: Rename sbuf/SBufList and sbuf/SBufStream
X-Git-Tag: SQUID_4_0_8~51^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58d8264f859002577db1a95478c4b5653091b98d;p=thirdparty%2Fsquid.git

Rename sbuf/SBufList and sbuf/SBufStream
---

diff --git a/src/acl/Acl.h b/src/acl/Acl.h
index bbd87ab83a..f99867acc9 100644
--- 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 bfb917daa5..e879288afc 100644
--- 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 28518f2f27..d507e0e7be 100644
--- 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 d45d95a55d..40c6c41da2 100644
--- 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 2c87183646..ae7ff0bd86 100644
--- 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 b2d1392c28..8b06dfc8d1 100644
--- 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 feb9e9ba1e..feb3b09f38 100644
--- 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 0a32d404b8..cc4ca0e16b 100644
--- 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 0a9a8c0de9..0712bd418e 100644
--- 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
  *