From 28041f64283ce1911c89867eea103be7bfaefeaa Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Wed, 6 Jan 2021 12:01:34 -0500 Subject: [PATCH] Restore GTEST_ATTRIBUTE_PRINTF_ on ColoredPrintf This fixes build issues with GoogleTest when built with -Wformat-nonliteral and unblocks updating GoogleTest in BoringSSL. It was added in 53c478d639b8eebd2942e88266610ebc79c541f6, which caught some bugs. Then it was moved to the header and accidentally dropped in 482ac6ee63429af2aa9c44f4e6427873fb68fb1f. --- googletest/src/gtest.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 910c1ad3..f134a6f7 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -3269,7 +3269,8 @@ bool ShouldUseColor(bool stdout_is_tty) { // This routine must actually emit the characters rather than return a string // that would be colored when printed, as can be done on Linux. -static void ColoredPrintf(GTestColor color, const char* fmt, ...) { +GTEST_ATTRIBUTE_PRINTF_(2, 3) +static void ColoredPrintf(GTestColor color, const char *fmt, ...) { va_list args; va_start(args, fmt);