From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 3 Mar 2015 16:51:03 +0000 (-0800)
Subject: Rename MemBuf::vPrintf to MemBuf::vappendf
X-Git-Tag: merge-candidate-3-v1~101^2~10^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ed3716ac1fe69ffcb051ff0972daa4ac2aba954;p=thirdparty%2Fsquid.git

Rename MemBuf::vPrintf to MemBuf::vappendf

... inline with the Packable API method name
---

diff --git a/src/HttpHeaderTools.cc b/src/HttpHeaderTools.cc
index ed01a145da..fccf202e5c 100644
--- a/src/HttpHeaderTools.cc
+++ b/src/HttpHeaderTools.cc
@@ -114,7 +114,7 @@ httpHeaderPutStrvf(HttpHeader * hdr, http_hdr_type id, const char *fmt, va_list
 {
     MemBuf mb;
     mb.init();
-    mb.vPrintf(fmt, vargs);
+    mb.vappendf(fmt, vargs);
     hdr->putStr(id, mb.buf);
     mb.clean();
 }
diff --git a/src/MemBuf.cc b/src/MemBuf.cc
index d4b25923da..73562c8cd1 100644
--- a/src/MemBuf.cc
+++ b/src/MemBuf.cc
@@ -268,15 +268,15 @@ MemBuf::Printf(const char *fmt,...)
 {
     va_list args;
     va_start(args, fmt);
-    vPrintf(fmt, args);
+    vappendf(fmt, args);
     va_end(args);
 }
 
 /**
- * vPrintf for other printf()'s to use; calls vsnprintf, extends buf if needed
+ * vappendf for other printf()'s to use; calls vsnprintf, extends buf if needed
  */
 void
-MemBuf::vPrintf(const char *fmt, va_list vargs)
+MemBuf::vappendf(const char *fmt, va_list vargs)
 {
 #ifdef VA_COPY
     va_list ap;
diff --git a/src/MemBuf.h b/src/MemBuf.h
index 81813c6fd3..020d949897 100644
--- a/src/MemBuf.h
+++ b/src/MemBuf.h
@@ -105,8 +105,8 @@ public:
      */
     void Printf(const char *fmt,...) PRINTF_FORMAT_ARG2;
 
-    /** vPrintf for other printf()'s to use */
-    void vPrintf(const char *fmt, va_list ap);
+    /** vappendf for other printf()'s to use */
+    void vappendf(const char *fmt, va_list ap);
 
     /**
      * freezes the object! and returns function to clear it up.
diff --git a/src/Packer.cc b/src/Packer.cc
index d5ca057d91..54fb615908 100644
--- a/src/Packer.cc
+++ b/src/Packer.cc
@@ -33,7 +33,7 @@ memBufAppend(MemBuf *mb, const char *buf, mb_size_t len)
 static void
 memBufVPrintf(MemBuf * mb, const char *fmt, va_list vargs)
 {
-    mb->vPrintf(fmt, vargs);
+    mb->vappendf(fmt, vargs);
 }
 
 static void
diff --git a/src/tests/stub_MemBuf.cc b/src/tests/stub_MemBuf.cc
index 2f7dea2855..e356f69b0e 100644
--- a/src/tests/stub_MemBuf.cc
+++ b/src/tests/stub_MemBuf.cc
@@ -25,7 +25,7 @@ void MemBuf::clean() STUB
 void MemBuf::reset() STUB
 int MemBuf::isNull() STUB_RETVAL(1)
 void MemBuf::Printf(const char *fmt,...) STUB
-void MemBuf::vPrintf(const char *fmt, va_list ap) STUB
+void MemBuf::vappendf(const char *fmt, va_list ap) STUB
 FREE *MemBuf::freeFunc() STUB_RETVAL(NULL)
 
 void memBufReport(MemBuf * mb) STUB