commit 70e51e6d761d53cbee6ddd92a778cadc9ecd1c81
author John Stiles <johnstiles@google.com> Wed Feb 17 20:43:54 2021 -0500
committer John Stiles <johnstiles@google.com> Thu Feb 18 14:16:35 2021 +0000
tree c46aa38e3264974507c1452f0cc3a6e2999d5fab
parent 9f8e9ece8a4a10e1ab00f43edf589591ff45470a

Enable printf warnings on SkSL::String.

Change-Id: Ifea2b490b86e69b871d31dea544407e857dc4677
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/371484
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>

src/sksl/SkSLCPPCodeGenerator.cpp

diff --git a/src/sksl/SkSLCPPCodeGenerator.cpp b/src/sksl/SkSLCPPCodeGenerator.cpp
index 0c26b43..1c19804 100644
--- a/src/sksl/SkSLCPPCodeGenerator.cpp
+++ b/src/sksl/SkSLCPPCodeGenerator.cpp
@@ -388,7 +388,7 @@
 }
 
 String CPPCodeGenerator::getSampleVarName(const char* prefix, int sampleCounter) {
-    return String::printf("%s%zu", prefix, sampleCounter);
+    return String::printf("%s%d", prefix, sampleCounter);
 }
 
 void CPPCodeGenerator::writeFunctionCall(const FunctionCall& c) {

src/sksl/SkSLString.cpp

diff --git a/src/sksl/SkSLString.cpp b/src/sksl/SkSLString.cpp
index ec3e569..df91368 100644
--- a/src/sksl/SkSLString.cpp
+++ b/src/sksl/SkSLString.cpp
@@ -9,6 +9,7 @@
 
 #include "src/sksl/SkSLUtil.h"
 #include <algorithm>
+#include <cinttypes>
 #include <errno.h>
 #include <limits.h>
 #include <locale>
@@ -202,19 +203,19 @@
 }
 
 String to_string(int32_t value) {
-    return SkSL::String::printf("%d", value);
+    return SkSL::String::printf("%" PRIi32, value);
 }
 
 String to_string(uint32_t value) {
-    return SkSL::String::printf("%u", value);
+    return SkSL::String::printf("%" PRIu32, value);
 }
 
 String to_string(int64_t value) {
-    return SkSL::String::printf("%lld", value);
+    return SkSL::String::printf("%" PRIi64, value);
 }
 
 String to_string(uint64_t value) {
-    return SkSL::String::printf("%llu", value);
+    return SkSL::String::printf("%" PRIu64, value);
 }
 
 String to_string(double value) {

src/sksl/SkSLString.h

diff --git a/src/sksl/SkSLString.h b/src/sksl/SkSLString.h
index 1eacba1..7c01528 100644
--- a/src/sksl/SkSLString.h
+++ b/src/sksl/SkSLString.h
@@ -73,8 +73,8 @@
 
     String(StringFragment s) : INHERITED(s.fChars, s.fLength) {}
 
-    static String printf(const char* fmt, ...);
-    void appendf(const char* fmt, ...);
+    static String printf(const char* fmt, ...) SK_PRINTF_LIKE(1, 2);
+    void appendf(const char* fmt, ...) SK_PRINTF_LIKE(2, 3);
     void vappendf(const char* fmt, va_list va);
 
     bool startsWith(const char prefix[]) const {