diff options
| author | Vitaly Buka <vitalybuka@google.com> | 2016-01-22 12:33:59 -0800 |
|---|---|---|
| committer | Vitaly Buka <vitalybuka@google.com> | 2016-01-22 21:43:16 +0000 |
| commit | 50a147a0d09185e0e0f6913e2b8bc33734a54f3f (patch) | |
| tree | a636bd2cfa1756b3520dd571dcf3fc30f8f03cfa | |
| parent | 73c8cfceede41899c0847ea8cfa4595049576a8f (diff) | |
| download | libweave-50a147a0d09185e0e0f6913e2b8bc33734a54f3f.tar.gz | |
Enforce printf format literals checking
Change-Id: Ifcba2251a723770e8bce12e39beda8236c814c42
Reviewed-on: https://weave-review.googlesource.com/2320
Reviewed-by: Alex Vakulenko <avakulenko@google.com>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | third_party/chromium/base/strings/stringprintf.cc | 3 | ||||
| -rw-r--r-- | third_party/chromium/base/strings/stringprintf_unittest.cc | 3 |
3 files changed, 7 insertions, 1 deletions
@@ -26,9 +26,9 @@ CFLAGS := \ -Wall \ -Werror \ -Wextra \ + -Wformat=2 \ -Wl,--exclude-libs,ALL \ -Wno-char-subscripts \ - -Wno-format-nonliteral \ -Wno-missing-field-initializers \ -Wno-unused-local-typedefs \ -Wno-unused-parameter \ diff --git a/third_party/chromium/base/strings/stringprintf.cc b/third_party/chromium/base/strings/stringprintf.cc index 8147ed3..c3ef88c 100644 --- a/third_party/chromium/base/strings/stringprintf.cc +++ b/third_party/chromium/base/strings/stringprintf.cc @@ -27,7 +27,10 @@ inline int vsnprintfT(char* buffer, size_t buf_size, const char* format, va_list argptr) { +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-nonliteral" return base::vsnprintf(buffer, buf_size, format, argptr); +#pragma GCC diagnostic pop } // Templatized backend for StringPrintF/StringAppendF. This does not finalize diff --git a/third_party/chromium/base/strings/stringprintf_unittest.cc b/third_party/chromium/base/strings/stringprintf_unittest.cc index e70499d..7e9b13c 100644 --- a/third_party/chromium/base/strings/stringprintf_unittest.cc +++ b/third_party/chromium/base/strings/stringprintf_unittest.cc @@ -22,7 +22,10 @@ namespace { static void StringAppendVTestHelper(std::string* out, const char* format, ...) { va_list ap; va_start(ap, format); +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-nonliteral" StringAppendV(out, format, ap); +#pragma GCC diagnostic pop va_end(ap); } |