commit 0a6d7f30284d9e67c32acdb1abbd73da9ced4ca2 Author: Arthur Edelstein <arthuredelstein@gmail.com> Date: Mon Jan 4 09:32:21 2016 -0800 Bug 17931: Use a non-format argument in LogMessageToConsole --- dom/base/nsContentUtils.cpp | 15 ++------------- dom/base/nsContentUtils.h | 4 ++-- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index be130e4..5d3dea7 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -11,7 +11,6 @@ #include <algorithm> #include <math.h> -#include "prprf.h" #include "DecoderTraits.h" #include "harfbuzz/hb.h" #include "imgICache.h" @@ -3392,7 +3391,7 @@ nsContentUtils::ReportToConsoleNonLocalized(const nsAString& aErrorText, } void -nsContentUtils::LogMessageToConsole(const char* aMsg, ...) +nsContentUtils::LogMessageToConsole(const char* aMsg) { if (!sConsoleService) { // only need to bother null-checking here CallGetService(NS_CONSOLESERVICE_CONTRACTID, &sConsoleService); @@ -3400,17 +3399,7 @@ nsContentUtils::LogMessageToConsole(const char* aMsg, ...) return; } } - - va_list args; - va_start(args, aMsg); - char* formatted = PR_vsmprintf(aMsg, args); - va_end(args); - if (!formatted) { - return; - } - - sConsoleService->LogStringMessage(NS_ConvertUTF8toUTF16(formatted).get()); - PR_smprintf_free(formatted); + sConsoleService->LogStringMessage(NS_ConvertUTF8toUTF16(aMsg).get()); } bool diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 699889a..b194ae4 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -825,8 +825,8 @@ public: uint32_t aLineNumber = 0, uint32_t aColumnNumber = 0); - static void LogMessageToConsole(const char* aMsg, ...); - + static void LogMessageToConsole(const char* aMsg); + /** * Get the localized string named |aKey| in properties file |aFile|. */