remove sprintf

tests/PathOpsSimplifyDegenerateThreadedTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "PathOpsExtendedTest.h"
 #include "PathOpsThreadedCommon.h"
+#include "SkString.h"
 
 static void testSimplifyDegeneratesMain(PathOpsThreadState* data) {
     SkASSERT(data);
     PathOpsThreadState& state = *data;
-    char pathStr[1024];
-    bool progress = state.fReporter->verbose(); // FIXME: break out into its own parameter?
-    if (progress) {
-        sk_bzero(pathStr, sizeof(pathStr));
-    }
     int ax = state.fA & 0x03;
     int ay = state.fA >> 2;
     int bx = state.fB & 0x03;
     int by = state.fB >> 2;
     int cx = state.fC & 0x03;
     int cy = state.fC >> 2;
     for (int d = 0; d < 16; ++d) {
         int dx = d & 0x03;
         int dy = d >> 2;
         for (int e = d ; e < 16; ++e) {
             int ex = e & 0x03;
             int ey = e >> 2;
             for (int f = d ; f < 16; ++f) {
                 int fx = f & 0x03;
                 int fy = f >> 2;
                 if (state.fD && (ex - dx) * (fy - dy)
                         != (ey - dy) * (fx - dx)) {
                     continue;
                 }
+                SkString pathStr;
                 SkPath path, out;
                 path.setFillType(SkPath::kWinding_FillType);
                 path.moveTo(SkIntToScalar(ax), SkIntToScalar(ay));
                 path.lineTo(SkIntToScalar(bx), SkIntToScalar(by));
                 path.lineTo(SkIntToScalar(cx), SkIntToScalar(cy));
                 path.close();
                 path.moveTo(SkIntToScalar(dx), SkIntToScalar(dy));
                 path.lineTo(SkIntToScalar(ex), SkIntToScalar(ey));
                 path.lineTo(SkIntToScalar(fx), SkIntToScalar(fy));
                 path.close();
-                if (progress) {
-                    char* str = pathStr;
-                    str += sprintf(str, "    path.moveTo(%d, %d);\n", ax, ay);
-                    str += sprintf(str, "    path.lineTo(%d, %d);\n", bx, by);
-                    str += sprintf(str, "    path.lineTo(%d, %d);\n", cx, cy);
-                    str += sprintf(str, "    path.close();\n");
-                    str += sprintf(str, "    path.moveTo(%d, %d);\n", dx, dy);
-                    str += sprintf(str, "    path.lineTo(%d, %d);\n", ex, ey);
-                    str += sprintf(str, "    path.lineTo(%d, %d);\n", fx, fy);
-                    str += sprintf(str, "    path.close();\n");
-                    outputProgress(state.fPathStr, pathStr, SkPath::kWinding_FillType);
+                if (state.fReporter->verbose()) {
+                    pathStr.appendf("    path.moveTo(%d, %d);\n", ax, ay);
+                    pathStr.appendf("    path.lineTo(%d, %d);\n", bx, by);
+                    pathStr.appendf("    path.lineTo(%d, %d);\n", cx, cy);
+                    pathStr.appendf("    path.close();\n");
+                    pathStr.appendf("    path.moveTo(%d, %d);\n", dx, dy);
+                    pathStr.appendf("    path.lineTo(%d, %d);\n", ex, ey);
+                    pathStr.appendf("    path.lineTo(%d, %d);\n", fx, fy);
+                    pathStr.appendf("    path.close();\n");
+                    outputProgress(state.fPathStr, pathStr.c_str(), SkPath::kWinding_FillType);
                 }
-                testSimplify(path, false, out, state, pathStr);
+                testSimplify(path, false, out, state, pathStr.c_str());
                 path.setFillType(SkPath::kEvenOdd_FillType);
-                if (progress) {
-                    outputProgress(state.fPathStr, pathStr, SkPath::kEvenOdd_FillType);
+                if (state.fReporter->verbose()) {
+                    outputProgress(state.fPathStr, pathStr.c_str(), SkPath::kEvenOdd_FillType);
                 }
-                testSimplify(path, true, out, state, pathStr);
+                testSimplify(path, true, out, state, pathStr.c_str());
             }
         }
     }
 }
 
 DEF_TEST(PathOpsSimplifyDegeneratesThreaded, reporter) {
     initializeTests(reporter, "testDegenerates");
     PathOpsThreadedTestRunner testRunner(reporter);
     for (int a = 0; a < 16; ++a) {
         int ax = a & 0x03;
         int ay = a >> 2;
         for (int b = a ; b < 16; ++b) {
             int bx = b & 0x03;
             int by = b >> 2;
             for (int c = a ; c < 16; ++c) {
                 int cx = c & 0x03;
                 int cy = c >> 2;
                 bool abcIsATriangle = (bx - ax) * (cy - ay) != (by - ay) * (cx - ax);
                 *testRunner.fRunnables.append() = new PathOpsThreadedRunnable(
                         &testSimplifyDegeneratesMain, a, b, c, abcIsATriangle, &testRunner);
             }
             if (!reporter->allowExtendedTest()) goto finish;
         }
     }
 finish:
     testRunner.render();
 }