Cleanup: drop MemBuf.cci

Inline the code previously contained in MemBuf.cci.

Also, cleanup MemBuf.h TODOs.

diff --git a/src/Makefile.am b/src/Makefile.am
index 91e05fc343c1b6dc7542b73711c2d85bc0f5a075..b0330acd93e1a7c67abad1533601b75dc67922a8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -582,7 +582,6 @@ EXTRA_squid_SOURCES = \
 
 noinst_HEADERS = \
        client_side_request.cci \
-       MemBuf.cci \
        MemBuf.h \
        StoreEntryStream.h \
        String.cci \
@@ -730,7 +729,6 @@ ufsdump_SOURCES = \
        Mem.h \
        mem.cc \
        MemBuf.cc \
-       MemBuf.cci \
        MemBuf.h \
        Parsing.h \
        store_key_md5.h \

diff --git a/src/MemBuf.cc b/src/MemBuf.cc
index d1bf92d3cdcb93213111c7ab49a6b51060e658ef..2759e0e0cb44b022a97c59bea961b9c09bec22e4 100644 (file)
--- a/src/MemBuf.cc
+++ b/src/MemBuf.cc
@@ -399,7 +399,3 @@ memBufReport(MemBuf * mb)
     assert(mb);
     mb->Printf("memBufReport is not yet implemented @?@\n");
 }
-
-#if !_USE_INLINE_
-#include "MemBuf.cci"
-#endif

diff --git a/src/MemBuf.cci b/src/MemBuf.cci
deleted file mode 100644 (file)
index 3510513..0000000
--- a/src/MemBuf.cci
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (C) 1996-2014 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.
- */
-
-/* DEBUG: section 59    auto-growing Memory Buffer with printf */
-
-MemBuf::MemBuf() : buf (NULL), size (0), max_capacity (0), capacity(0), stolen(0)
-{}
-
-MemBuf::~MemBuf()
-{
-    if (!stolen && buf)
-        clean();
-}

diff --git a/src/MemBuf.h b/src/MemBuf.h
index bafe5df82dd689656624cf70508ab359cd198169..b652ad25492da234512f2bc4b56dedbff1b4d685 100644 (file)
--- a/src/MemBuf.h
+++ b/src/MemBuf.h
@@ -14,15 +14,22 @@
 
 /**
  * Auto-growing memory-resident buffer with printf interface
- *
- \todo XXX: convert global memBuf*() functions into methods
+ * \deprecated Use SBuf instead.
  */
 class MemBuf
 {
-
 public:
-    _SQUID_INLINE_ MemBuf();
-    _SQUID_INLINE_ ~MemBuf();
+    MemBuf():
+        buf(NULL),
+        size(0),
+        max_capacity(0),
+        capacity(0),
+        stolen(0)
+    {}
+    ~MemBuf() {
+        if (!stolen && buf)
+            clean();
+    }
 
     /// start of the added data
     char *content() { return buf; }
@@ -122,7 +129,7 @@ public:
      \deprecated use space*() and content*() methods to access safely instead.
      * public, read-only.
      *
-     \todo XXX: hide these members completely and remove 0-termination
+     * TODO: hide these members completely and remove 0-termination
      *          so that consume() does not need to memmove all the time
      */
     char *buf;          // available content
@@ -130,15 +137,15 @@ public:
 
     /**
      * when grows: assert(new_capacity <= max_capacity)
-     \deprecated Use interface function instead
-     \todo XXX: make these private after converting memBuf*() functions to methods
+     * \deprecated Use interface function instead
+     * TODO: make these private after converting memBuf*() functions to methods
      */
     mb_size_t max_capacity;
 
     /**
      * allocated space
-     \deprecated Use interface function instead
-     \todo XXX: make these private after converting memBuf*() functions to methods
+     * \deprecated Use interface function instead
+     * TODO: make these private after converting memBuf*() functions to methods
      */
     mb_size_t capacity;
 
@@ -153,13 +160,9 @@ private:
     CBDATA_CLASS2(MemBuf);
 };
 
-#if _USE_INLINE_
-#include "MemBuf.cci"
-#endif
-
 /** returns free() function to be used, _freezes_ the object! */
 void memBufReport(MemBuf * mb);
 /** pack content into a mem buf. */
 void packerToMemInit(Packer * p, MemBuf * mb);
 
-#endif /* SQUID_MEM_H */
+#endif /* SQUID_MEMBUF_H */

diff --git a/src/tests/stub_MemBuf.cc b/src/tests/stub_MemBuf.cc
index 25930677db6b1a67685399f267b153a20197e7bc..66c8e95d2a187bcee00feb8178ea69705022a10e 100644 (file)
--- a/src/tests/stub_MemBuf.cc
+++ b/src/tests/stub_MemBuf.cc
@@ -28,9 +28,5 @@ void MemBuf::Printf(const char *fmt,...) STUB
 void MemBuf::vPrintf(const char *fmt, va_list ap) STUB
 FREE *MemBuf::freeFunc() STUB_RETVAL(NULL)
 
-#if !_USE_INLINE_
-#include "MemBuf.cci"
-#endif
-
 void memBufReport(MemBuf * mb) STUB
 void packerToMemInit(Packer * p, MemBuf * mb) STUB