commit bdf6c3d6728f563a143862f1909cb0e6717a8b23
author Elliott Hughes <enh@google.com> Tue Mar 20 13:43:53 2012 -0700
committer Elliott Hughes <enh@google.com> Tue Mar 20 13:43:53 2012 -0700
tree b01ccf0fef8880e4e273d858134090d919ee2fb9
parent 0637e27af8e54f39634024dc77e8b094f21782f9

Trivial cleanup of typos and fixed-length buffers.

Change-Id: I4ea3bb51320160c5ebda8b2a8ba3ca81452915b5

src/compiler/codegen/CodegenUtil.cc

diff --git a/src/compiler/codegen/CodegenUtil.cc b/src/compiler/codegen/CodegenUtil.cc
index c9c9c5e..2e2c254 100644
--- a/src/compiler/codegen/CodegenUtil.cc
+++ b/src/compiler/codegen/CodegenUtil.cc
@@ -326,33 +326,29 @@
     }
 }
 
-#define BSZ 100
 void oatDumpPromotionMap(CompilationUnit *cUnit)
 {
     int numRegs = cUnit->numDalvikRegisters + cUnit->numCompilerTemps + 1;
     for (int i = 0; i < numRegs; i++) {
         PromotionMap vRegMap = cUnit->promotionMap[i];
-        char buf[BSZ];
+        std::string buf;
         if (vRegMap.fpLocation == kLocPhysReg) {
-            snprintf(buf, 100, " : s%d", vRegMap.fpReg & FP_REG_MASK);
-        } else {
-            buf[0] = 0;
-        }
-        char buf2[BSZ];
-        char buf3[BSZ];
-        if (i < cUnit->numDalvikRegisters) {
-            snprintf(buf3, BSZ, "%02d", i);
-        } else if (i == cUnit->methodSReg) {
-            strncpy(buf3, "Method*", BSZ);
-        } else {
-            snprintf(buf3, BSZ, "ct%d", i - cUnit->numDalvikRegisters);
+            StringAppendF(&buf, " : s%d", vRegMap.fpReg & FP_REG_MASK);
         }
 
-        snprintf(buf2, BSZ, "V[%s] -> %s%d%s", buf3,
+        std::string buf3;
+        if (i < cUnit->numDalvikRegisters) {
+            StringAppendF(&buf3, "%02d", i);
+        } else if (i == cUnit->methodSReg) {
+            buf3 = "Method*";
+        } else {
+            StringAppendF(&buf3, "ct%d", i - cUnit->numDalvikRegisters);
+        }
+
+        LOG(INFO) << StringPrintf("V[%s] -> %s%d%s", buf3.c_str(),
                  vRegMap.coreLocation == kLocPhysReg ?
                  "r" : "SP+", vRegMap.coreLocation == kLocPhysReg ?
-                 vRegMap.coreReg : oatSRegOffset(cUnit, i), buf);
-        LOG(INFO) << buf2;
+                 vRegMap.coreReg : oatSRegOffset(cUnit, i), buf.c_str());
     }
 }