diff options
author | Orgad Shaneh <orgads@gmail.com> | 2017-08-28 10:26:23 +0300 |
---|---|---|
committer | Mike Frysinger <vapier@chromium.org> | 2017-09-25 07:10:11 +0000 |
commit | 09df67311f4621cc7504e2281d90241e7605a278 (patch) | |
tree | fa07ee0ec531bc0c5a830fc556f6048d42ba509f /src/tools/windows/converter | |
parent | Refresh refresh_binaries.bat (diff) | |
download | breakpad-09df67311f4621cc7504e2281d90241e7605a278.tar.xz |
Fix MSVC build on 64-bit
Mostly int<->size_t implicit conversions.
Warning 4366 (The result of the unary '&' operator may be unaligned)
appears in minidump.cc:907, but I don't know why. It looks aligned to me.
Change-Id: I641942adc324f8f9832b20662083dc83498688a8
Reviewed-on: https://chromium-review.googlesource.com/637390
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'src/tools/windows/converter')
-rw-r--r-- | src/tools/windows/converter/ms_symbol_server_converter.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/windows/converter/ms_symbol_server_converter.cc b/src/tools/windows/converter/ms_symbol_server_converter.cc index dd3f770f..71b77097 100644 --- a/src/tools/windows/converter/ms_symbol_server_converter.cc +++ b/src/tools/windows/converter/ms_symbol_server_converter.cc @@ -73,7 +73,7 @@ bool GUIDOrSignatureIdentifier::InitializeFromString( if (length > 32 && length <= 40) { // GUID if (SSCANF(identifier.c_str(), - "%08X%04X%04X%02X%02X%02X%02X%02X%02X%02X%02X%X", + "%08X%04hX%04hX%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX%X", &guid_.Data1, &guid_.Data2, &guid_.Data3, &guid_.Data4[0], &guid_.Data4[1], &guid_.Data4[2], &guid_.Data4[3], @@ -500,7 +500,7 @@ MSSymbolServerConverter::LocateAndConvertSymbolFile( if (!WindowsStringUtils::safe_mbstowcs(pdb_file, &pdb_file_w)) { fprintf(stderr, "LocateAndConvertSymbolFile: " - "WindowsStringUtils::safe_mbstowcs failed for %s\n", + "WindowsStringUtils::safe_mbstowcs failed for %ws\n", pdb_file_w.c_str()); return LOCATE_FAILURE; } |