generic-library/breakpad
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix usage of snprintf for MSVC

Browse Source 
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 <labath@google.com>.
This commit is contained in:
Pavel Labath
2016-01-19 21:28:44 -05:00
committed by Mark Mentovai
parent 126a938fef
commit 48673cdb8c
7 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/processor/dump_context.cc
View File

@@ -34,17 +34,14 @@
#include "google_breakpad/processor/dump_context.h"
#include <assert.h>
#include <stdio.h>
#ifdef _WIN32
#include <io.h>
#if defined(_MSC_VER) && _MSC_VER < 1900
#define snprintf _snprintf
#endif
#else // _WIN32
#include <unistd.h>
#endif // _WIN32
#include "common/stdio.h"
#include "processor/logging.h"
namespace google_breakpad {

6
src/processor/logging.cc
View File

@@ -35,20 +35,16 @@
#include <assert.h>
#include <errno.h>
#include <stdio.h>
#include <string.h>
#include <time.h>
#include <string>
#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,

5
src/processor/minidump.cc
View File

@@ -38,15 +38,11 @@
#include <assert.h>
#include <fcntl.h>
#include <stddef.h>
#include <stdio.h>
#include <string.h>
#include <time.h>
#ifdef _WIN32
#include <io.h>
#if defined(_MSC_VER) && _MSC_VER < 1900
#define snprintf _snprintf
#endif
#else // _WIN32
#include <unistd.h>
#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"

2
src/processor/minidump_processor.cc
View File

@@ -30,11 +30,11 @@
#include "google_breakpad/processor/minidump_processor.h"
#include <assert.h>
#include <stdio.h>
#include <string>
#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"

2
src/processor/stackwalk_common.cc
View File

@@ -35,13 +35,13 @@
#include "processor/stackwalk_common.h"
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <string>
#include <vector>
#include "common/stdio.h"
#include "common/using_std_string.h"
#include "google_breakpad/processor/call_stack.h"
#include "google_breakpad/processor/code_module.h"

4
src/processor/symbolic_constants_win.cc
View File

@@ -33,9 +33,9 @@
//
// Author: Ben Wagner
#include <cstdio>
#include <string>
#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;
}