remove sprintf

tests/PathOpsSimplifyQuadThreadedTest.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 int quadTest = 66;

[scroggo, 2016/10/06 14:42:00]

nit: gQuadTest

 
 static void testSimplifyQuadsMain(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));
-    }
+    SkString 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;
     int dx = state.fD & 0x03;
     int dy = state.fD >> 2;
     for (int e = 0 ; e < 16; ++e) {
         int ex = e & 0x03;
@@ skipping 12 matching lines @@
                     path.moveTo(SkIntToScalar(ax), SkIntToScalar(ay));
                     path.quadTo(SkIntToScalar(bx), SkIntToScalar(by),
                             SkIntToScalar(cx), SkIntToScalar(cy));
                     path.lineTo(SkIntToScalar(dx), SkIntToScalar(dy));
                     path.close();
                     path.moveTo(SkIntToScalar(ex), SkIntToScalar(ey));
                     path.lineTo(SkIntToScalar(fx), SkIntToScalar(fy));
                     path.quadTo(SkIntToScalar(gx), SkIntToScalar(gy),
                             SkIntToScalar(hx), SkIntToScalar(hy));
                     path.close();
-                    if (progress) {
-                        static int quadTest = 66;
-                        char* str = pathStr;
-                        str += sprintf(str, "static void testQuads%d(skiatest::Reporter* reporter,"
+                    if (state.fReporter->verbose()) {
+                        pathStr.printf("static void testQuads%d(skiatest::Reporter* reporter,"
                                 "const char* filename) {\n", quadTest);
-                        str += sprintf(str, "    SkPath path;\n");
-                        str += sprintf(str, "    path.moveTo(%d, %d);\n", ax, ay);
-                        str += sprintf(str, "    path.quadTo(%d, %d, %d, %d);\n", bx, by, cx, cy);
-                        str += sprintf(str, "    path.lineTo(%d, %d);\n", dx, dy);
-                        str += sprintf(str, "    path.close();\n");
-                        str += sprintf(str, "    path.moveTo(%d, %d);\n", ex, ey);
-                        str += sprintf(str, "    path.lineTo(%d, %d);\n", fx, fy);
-                        str += sprintf(str, "    path.quadTo(%d, %d, %d, %d);\n", gx, gy, hx, hy);
-                        str += sprintf(str, "    path.close();\n");
-                        str += sprintf(str, "    testSimplify(reporter, path, filename);\n");
-                        str += sprintf(str, "}\n");
-                        outputProgress(state.fPathStr, pathStr, SkPath::kWinding_FillType);
+                        pathStr.appendf("    SkPath path;\n");
+                        pathStr.appendf("    path.moveTo(%d, %d);\n", ax, ay);
+                        pathStr.appendf("    path.quadTo(%d, %d, %d, %d);\n", bx, by, cx, cy);
+                        pathStr.appendf("    path.lineTo(%d, %d);\n", dx, dy);
+                        pathStr.appendf("    path.close();\n");
+                        pathStr.appendf("    path.moveTo(%d, %d);\n", ex, ey);
+                        pathStr.appendf("    path.lineTo(%d, %d);\n", fx, fy);
+                        pathStr.appendf("    path.quadTo(%d, %d, %d, %d);\n", gx, gy, hx, hy);
+                        pathStr.appendf("    path.close();\n");
+                        pathStr.appendf("    testSimplify(reporter, path, filename);\n");
+                        pathStr.appendf("}\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(PathOpsSimplifyQuadsThreaded, reporter) {
     initializeTests(reporter, "testQuads");
     PathOpsThreadedTestRunner testRunner(reporter);
     int a = 0;
     for (; a < 16; ++a) {
         for (int b = a ; b < 16; ++b) {
             for (int c = b ; c < 16; ++c) {
                 for (int d = c; d < 16; ++d) {
                     *testRunner.fRunnables.append() = new PathOpsThreadedRunnable(
                             &testSimplifyQuadsMain, a, b, c, d, &testRunner);
                 }
                 if (!reporter->allowExtendedTest()) goto finish;
             }
         }
     }
 finish:
     testRunner.render();
 }