Add and use StringAppendF.

I've also removed the dvm prefix from the existing StringPrintf.

Change-Id: I3d01f676c876957b6c6e032c674e1a06c3670021

4 files changed, 23 insertions, 9 deletions

diff --git a/vm/Misc.cpp b/vm/Misc.cpp
index 3cbd5633c..12e3b888e 100644
--- a/vm/Misc.cpp
+++ b/vm/Misc.cpp
@@ -779,7 +779,7 @@ static void StringAppendV(std::string* dst, const char* format, va_list ap) {
     }
 }
 
-std::string dvmStringPrintf(const char* fmt, ...) {
+std::string StringPrintf(const char* fmt, ...) {
     va_list ap;
     va_start(ap, fmt);
     std::string result;
@@ -787,3 +787,10 @@ std::string dvmStringPrintf(const char* fmt, ...) {
     va_end(ap);
     return result;
 }
+
+void StringAppendF(std::string* dst, const char* format, ...) {
+    va_list ap;
+    va_start(ap, format);
+    StringAppendV(dst, format, ap);
+    va_end(ap);
+}
diff --git a/vm/Misc.h b/vm/Misc.h
index f861c6c53..e027f0cd2 100644
--- a/vm/Misc.h
+++ b/vm/Misc.h
@@ -315,6 +315,13 @@ const char* dvmPathToAbsolutePortion(const char* path);
 /**
  * Returns a string corresponding to printf-like formatting of the arguments.
  */
-std::string dvmStringPrintf(const char* fmt, ...) __attribute__((__format__ (__printf__, 1, 2)));
+std::string StringPrintf(const char* fmt, ...)
+        __attribute__((__format__ (__printf__, 1, 2)));
+
+/**
+ * Appends a printf-like formatting of the arguments to 'dst'.
+ */
+void StringAppendF(std::string* dst, const char* fmt, ...)
+        __attribute__((__format__ (__printf__, 2, 3)));
 
 #endif  // DALVIK_MISC_H_
diff --git a/vm/ReferenceTable.cpp b/vm/ReferenceTable.cpp
index 1438bdcf4..a328ec798 100644
--- a/vm/ReferenceTable.cpp
+++ b/vm/ReferenceTable.cpp
@@ -216,14 +216,14 @@ static void logObject(const Object* obj, size_t elems, int identical, int equiv)
     } else {
         className = dvmHumanReadableType(obj);
         if (elems != 0) {
-            className += dvmStringPrintf(" (%zd elements)", elems);
+            StringAppendF(&className, " (%zd elements)", elems);
         }
     }
 
     size_t total = identical + equiv + 1;
-    std::string msg(dvmStringPrintf("%5d of %s", total, className.c_str()));
+    std::string msg(StringPrintf("%5d of %s", total, className.c_str()));
     if (identical + equiv != 0) {
-        msg += dvmStringPrintf(" (%d unique instances)", equiv + 1);
+        StringAppendF(&msg, " (%d unique instances)", equiv + 1);
     }
     LOGW("%s", msg.c_str());
 }
@@ -269,7 +269,7 @@ void dvmDumpReferenceTableContents(Object* const* refs, size_t count,
         std::string extras;
         size_t elems = getElementCount(ref);
         if (elems != 0) {
-            extras += dvmStringPrintf(" (%zd elements)", elems);
+            StringAppendF(&extras, " (%zd elements)", elems);
         } else if (ref->clazz == gDvm.classJavaLangString) {
             const StringObject* str =
                     reinterpret_cast<const StringObject*>(ref);
@@ -283,7 +283,7 @@ void dvmDumpReferenceTableContents(Object* const* refs, size_t count,
             if (*p == 0) {
                 extras += "\"";
             } else {
-                extras += dvmStringPrintf("... (%d chars)", dvmStringLen(str));
+                StringAppendF(&extras, "... (%d chars)", dvmStringLen(str));
             }
             free(s);
         }
diff --git a/vm/interp/Stack.cpp b/vm/interp/Stack.cpp
index 98c209baf..db1bd8981 100644
--- a/vm/interp/Stack.cpp
+++ b/vm/interp/Stack.cpp
@@ -1159,7 +1159,7 @@ static bool extractMonitorEnterObject(Thread* thread, Object** pLockObj,
 static void printWaitMessage(const DebugOutputTarget* target, const char* detail, Object* obj,
         Thread* thread)
 {
-    std::string msg(dvmStringPrintf("  - waiting %s <%p> ", detail, obj));
+    std::string msg(StringPrintf("  - waiting %s <%p> ", detail, obj));
 
     if (obj->clazz != gDvm.classJavaLangClass) {
         // I(16573)   - waiting on <0xf5feda38> (a java.util.LinkedList)
@@ -1169,7 +1169,7 @@ static void printWaitMessage(const DebugOutputTarget* target, const char* detail
 
     if (thread != NULL) {
         std::string threadName(dvmGetThreadName(thread));
-        msg += dvmStringPrintf(" held by tid=%d (%s)", thread->threadId, threadName.c_str());
+        StringAppendF(&msg, " held by tid=%d (%s)", thread->threadId, threadName.c_str());
     }
 
     dvmPrintDebugMessage(target, "%s\n", msg.c_str());