SourceFormat Enforcement

[thirdparty/squid.git] / src / MemBuf.cc

diff --git a/src/MemBuf.cc b/src/MemBuf.cc
index 13ffdefd82ea36ef67771b88af71b7be84a678b3..b953da0c7974890a9f3459176e66390eadc31c2c 100644 (file)
--- a/src/MemBuf.cc
+++ b/src/MemBuf.cc
@@ -99,10 +99,10 @@
  \endverbatim
  */
 
-/* if you have configure you can use this */
-#if defined(HAVE_CONFIG_H)
 #include "squid.h"
-#endif
+#include "MemBuf.h"
+#include "profiler/Profiler.h"
+#include "protos.h"
 
 #ifdef VA_COPY
 #undef VA_COPY
@@ -113,9 +113,6 @@
 #define VA_COPY __va_copy
 #endif
 
-#include "squid-old.h"
-#include "MemBuf.h"
-
 /* local constants */
 
 /* default values for buffer sizes, used by memBufDefInit */
@@ -131,7 +128,6 @@ MemBuf::init()
     init(MEM_BUF_INIT_SIZE, MEM_BUF_MAX_SIZE);
 }
 
-
 /** init with specific sizes */
 void
 MemBuf::init(mb_size_t szInit, mb_size_t szMax)
@@ -289,7 +285,6 @@ MemBuf::Printf(const char *fmt,...)
     va_end(args);
 }
 
-
 /**
  * vPrintf for other printf()'s to use; calls vsnprintf, extends buf if needed
  */
@@ -340,7 +335,7 @@ MemBuf::vPrintf(const char *fmt, va_list vargs)
     if (!size || buf[size - 1]) {
         assert(!buf[size]);
     } else {
-        size--;
+        --size;
     }
 }
 
@@ -406,7 +401,6 @@ MemBuf::grow(mb_size_t min_cap)
     PROF_stop(MemBuf_grow);
 }
 
-
 /* Reports */
 
 /**