From 48673cdb8c0c1e9eb137c7a68583b5e5898a54eb Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Tue, 19 Jan 2016 21:28:44 -0500 Subject: [PATCH] Fix usage of snprintf for MSVC Older versions of MSVC don't have a snprintf functions. Some files were already working around that, but not all of them. Instead of copying the logic into every file, I centralize it into a new stdio.h wrapper file and make other files include that. BUG= R=mark@chromium.org Review URL: https://codereview.chromium.org/1602563003 . Patch from Pavel Labath . --- src/common/stdio.h | 43 +++++++++++++++++++++++++ src/processor/dump_context.cc | 5 +-- src/processor/logging.cc | 6 +--- src/processor/minidump.cc | 5 +-- src/processor/minidump_processor.cc | 2 +- src/processor/stackwalk_common.cc | 2 +- src/processor/symbolic_constants_win.cc | 4 +-- 7 files changed, 50 insertions(+), 17 deletions(-) create mode 100644 src/common/stdio.h diff --git a/src/common/stdio.h b/src/common/stdio.h new file mode 100644 index 00000000..1eec8a00 --- /dev/null +++ b/src/common/stdio.h @@ -0,0 +1,43 @@ +// Copyright (c) 2016, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#ifndef GOOGLE_BREAKPAD_COMMON_STDIO_H +#define GOOGLE_BREAKPAD_COMMON_STDIO_H + +#include + +#if defined(_MSC_VER) && MSC_VER < 1900 +#include + +#define snprintf _snprintf +typedef SSIZE_T ssize_t; +#endif + + +#endif // GOOGLE_BREAKPAD_COMMON_STDIO_H diff --git a/src/processor/dump_context.cc b/src/processor/dump_context.cc index 49fb77b1..1c10b955 100644 --- a/src/processor/dump_context.cc +++ b/src/processor/dump_context.cc @@ -34,17 +34,14 @@ #include "google_breakpad/processor/dump_context.h" #include -#include #ifdef _WIN32 #include -#if defined(_MSC_VER) && _MSC_VER < 1900 -#define snprintf _snprintf -#endif #else // _WIN32 #include #endif // _WIN32 +#include "common/stdio.h" #include "processor/logging.h" namespace google_breakpad { diff --git a/src/processor/logging.cc b/src/processor/logging.cc index 8bb95a69..06c5510c 100644 --- a/src/processor/logging.cc +++ b/src/processor/logging.cc @@ -35,20 +35,16 @@ #include #include -#include #include #include #include +#include "common/stdio.h" #include "common/using_std_string.h" #include "processor/logging.h" #include "processor/pathname_stripper.h" -#ifdef _WIN32 -#define snprintf _snprintf -#endif - namespace google_breakpad { LogStream::LogStream(std::ostream &stream, Severity severity, diff --git a/src/processor/minidump.cc b/src/processor/minidump.cc index ccc90d5a..a23a0165 100644 --- a/src/processor/minidump.cc +++ b/src/processor/minidump.cc @@ -38,15 +38,11 @@ #include #include #include -#include #include #include #ifdef _WIN32 #include -#if defined(_MSC_VER) && _MSC_VER < 1900 -#define snprintf _snprintf -#endif #else // _WIN32 #include #endif // _WIN32 @@ -60,6 +56,7 @@ #include "processor/range_map-inl.h" #include "common/scoped_ptr.h" +#include "common/stdio.h" #include "google_breakpad/processor/dump_context.h" #include "processor/basic_code_module.h" #include "processor/basic_code_modules.h" diff --git a/src/processor/minidump_processor.cc b/src/processor/minidump_processor.cc index 3a20dfa5..78e98b8b 100644 --- a/src/processor/minidump_processor.cc +++ b/src/processor/minidump_processor.cc @@ -30,11 +30,11 @@ #include "google_breakpad/processor/minidump_processor.h" #include -#include #include #include "common/scoped_ptr.h" +#include "common/stdio.h" #include "common/using_std_string.h" #include "google_breakpad/processor/call_stack.h" #include "google_breakpad/processor/minidump.h" diff --git a/src/processor/stackwalk_common.cc b/src/processor/stackwalk_common.cc index 3a6e17fe..dd529fdb 100644 --- a/src/processor/stackwalk_common.cc +++ b/src/processor/stackwalk_common.cc @@ -35,13 +35,13 @@ #include "processor/stackwalk_common.h" #include -#include #include #include #include #include +#include "common/stdio.h" #include "common/using_std_string.h" #include "google_breakpad/processor/call_stack.h" #include "google_breakpad/processor/code_module.h" diff --git a/src/processor/symbolic_constants_win.cc b/src/processor/symbolic_constants_win.cc index 333aa041..adb0cc0a 100644 --- a/src/processor/symbolic_constants_win.cc +++ b/src/processor/symbolic_constants_win.cc @@ -33,9 +33,9 @@ // // Author: Ben Wagner -#include #include +#include "common/stdio.h" #include "google_breakpad/common/breakpad_types.h" #include "google_breakpad/common/minidump_exception_win32.h" #include "processor/symbolic_constants_win.h" @@ -6406,7 +6406,7 @@ std::string NTStatusToString(uint32_t ntstatus) { break; default: { char reason_string[11]; - std::snprintf(reason_string, sizeof(reason_string), "0x%08x", ntstatus); + snprintf(reason_string, sizeof(reason_string), "0x%08x", ntstatus); reason = reason_string; break; }