3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-09 22:16:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

More -Wshadow fixes.

Browse Source 
Bug: chromium:794619
Change-Id: I1987eb543d0b1a5f82eeb8504b6adde8ef6df600
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3238894
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Peter Kasting 2021-10-25 07:23:09 -07:00 committed by Crashpad LUCI CQ
parent 164b41de76
commit 2c45d05875
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/ios_handler/in_process_intermediate_dump_handler.cc
View File

@ -778,7 +778,7 @@ void InProcessIntermediateDumpHandler::WriteThreadInfo(
thread_t thread = threads[thread_index]; thread_t thread = threads[thread_index];
thread_basic_info basic_info; thread_basic_info basic_info;
mach_msg_type_number_t count = THREAD_BASIC_INFO_COUNT; count = THREAD_BASIC_INFO_COUNT;
kr = thread_info(thread, kr = thread_info(thread,
THREAD_BASIC_INFO, THREAD_BASIC_INFO,
reinterpret_cast<thread_info_t>(&basic_info), reinterpret_cast<thread_info_t>(&basic_info),
@ -810,7 +810,6 @@ void InProcessIntermediateDumpHandler::WriteThreadInfo(
#if defined(ARCH_CPU_ARM64) #if defined(ARCH_CPU_ARM64)
uint64_t thread_id; uint64_t thread_id;
#endif #endif
thread_identifier_info identifier_info;
count = THREAD_IDENTIFIER_INFO_COUNT; count = THREAD_IDENTIFIER_INFO_COUNT;
kr = thread_info(thread, kr = thread_info(thread,
THREAD_IDENTIFIER_INFO, THREAD_IDENTIFIER_INFO,
@ -859,11 +858,10 @@ void InProcessIntermediateDumpHandler::WriteThreadInfo(
mach_msg_type_number_t debug_state_count = ARM_DEBUG_STATE64_COUNT; mach_msg_type_number_t debug_state_count = ARM_DEBUG_STATE64_COUNT;
#endif #endif
kern_return_t kr = kr = thread_get_state(thread,
thread_get_state(thread, kThreadStateFlavor,
kThreadStateFlavor, reinterpret_cast<thread_state_t>(&thread_state),
reinterpret_cast<thread_state_t>(&thread_state), &thread_state_count);
&thread_state_count);
if (kr != KERN_SUCCESS) { if (kr != KERN_SUCCESS) {
CRASHPAD_RAW_LOG_ERROR(kr, "thread_get_state::kThreadStateFlavor"); CRASHPAD_RAW_LOG_ERROR(kr, "thread_get_state::kThreadStateFlavor");
} }

3
snapshot/mac/process_reader_mac_test.cc
View File

@ -504,8 +504,7 @@ class ProcessReaderThreadedChild final : public MachMultiprocess {
// Write an entry for everything in the thread pool. // Write an entry for everything in the thread pool.
for (size_t thread_index = 0; thread_index < thread_count_; for (size_t thread_index = 0; thread_index < thread_count_;
++thread_index) { ++thread_index) {
uint64_t thread_id = thread_id = thread_pool.GetThreadInfo(thread_index, &expectation);
thread_pool.GetThreadInfo(thread_index, &expectation);
CheckedWriteFile(write_handle, &thread_id, sizeof(thread_id)); CheckedWriteFile(write_handle, &thread_id, sizeof(thread_id));
CheckedWriteFile(write_handle, CheckedWriteFile(write_handle,

13
util/mach/exception_ports_test.cc
View File

@ -555,13 +555,12 @@ class TestExceptionPorts : public MachMultiprocess,
UniversalMachExcServer universal_mach_exc_server(this); UniversalMachExcServer universal_mach_exc_server(this);
constexpr mach_msg_timeout_t kTimeoutMs = 50; constexpr mach_msg_timeout_t kTimeoutMs = 50;
kern_return_t kr = kr = MachMessageServer::Run(&universal_mach_exc_server,
MachMessageServer::Run(&universal_mach_exc_server, local_port,
local_port, kMachMessageReceiveAuditTrailer,
kMachMessageReceiveAuditTrailer, MachMessageServer::kOneShot,
MachMessageServer::kOneShot, MachMessageServer::kReceiveLargeError,
MachMessageServer::kReceiveLargeError, kTimeoutMs);
kTimeoutMs);
EXPECT_EQ(kr, KERN_SUCCESS) EXPECT_EQ(kr, KERN_SUCCESS)
<< MachErrorMessage(kr, "MachMessageServer::Run"); << MachErrorMessage(kr, "MachMessageServer::Run");