From 2c45d05875b54df823cdf50930f631c75fed050f Mon Sep 17 00:00:00 2001 From: Peter Kasting Date: Mon, 25 Oct 2021 07:23:09 -0700 Subject: [PATCH] More -Wshadow fixes. Bug: chromium:794619 Change-Id: I1987eb543d0b1a5f82eeb8504b6adde8ef6df600 Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3238894 Commit-Queue: Peter Kasting Reviewed-by: Mark Mentovai --- .../in_process_intermediate_dump_handler.cc | 12 +++++------- snapshot/mac/process_reader_mac_test.cc | 3 +-- util/mach/exception_ports_test.cc | 13 ++++++------- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/client/ios_handler/in_process_intermediate_dump_handler.cc b/client/ios_handler/in_process_intermediate_dump_handler.cc index 7e04058a..e2c77223 100644 --- a/client/ios_handler/in_process_intermediate_dump_handler.cc +++ b/client/ios_handler/in_process_intermediate_dump_handler.cc @@ -778,7 +778,7 @@ void InProcessIntermediateDumpHandler::WriteThreadInfo( thread_t thread = threads[thread_index]; thread_basic_info basic_info; - mach_msg_type_number_t count = THREAD_BASIC_INFO_COUNT; + count = THREAD_BASIC_INFO_COUNT; kr = thread_info(thread, THREAD_BASIC_INFO, reinterpret_cast(&basic_info), @@ -810,7 +810,6 @@ void InProcessIntermediateDumpHandler::WriteThreadInfo( #if defined(ARCH_CPU_ARM64) uint64_t thread_id; #endif - thread_identifier_info identifier_info; count = THREAD_IDENTIFIER_INFO_COUNT; kr = thread_info(thread, THREAD_IDENTIFIER_INFO, @@ -859,11 +858,10 @@ void InProcessIntermediateDumpHandler::WriteThreadInfo( mach_msg_type_number_t debug_state_count = ARM_DEBUG_STATE64_COUNT; #endif - kern_return_t kr = - thread_get_state(thread, - kThreadStateFlavor, - reinterpret_cast(&thread_state), - &thread_state_count); + kr = thread_get_state(thread, + kThreadStateFlavor, + reinterpret_cast(&thread_state), + &thread_state_count); if (kr != KERN_SUCCESS) { CRASHPAD_RAW_LOG_ERROR(kr, "thread_get_state::kThreadStateFlavor"); } diff --git a/snapshot/mac/process_reader_mac_test.cc b/snapshot/mac/process_reader_mac_test.cc index 2f377584..6b4e108b 100644 --- a/snapshot/mac/process_reader_mac_test.cc +++ b/snapshot/mac/process_reader_mac_test.cc @@ -504,8 +504,7 @@ class ProcessReaderThreadedChild final : public MachMultiprocess { // Write an entry for everything in the thread pool. for (size_t thread_index = 0; thread_index < thread_count_; ++thread_index) { - uint64_t thread_id = - thread_pool.GetThreadInfo(thread_index, &expectation); + thread_id = thread_pool.GetThreadInfo(thread_index, &expectation); CheckedWriteFile(write_handle, &thread_id, sizeof(thread_id)); CheckedWriteFile(write_handle, diff --git a/util/mach/exception_ports_test.cc b/util/mach/exception_ports_test.cc index b29e125e..b818e60a 100644 --- a/util/mach/exception_ports_test.cc +++ b/util/mach/exception_ports_test.cc @@ -555,13 +555,12 @@ class TestExceptionPorts : public MachMultiprocess, UniversalMachExcServer universal_mach_exc_server(this); constexpr mach_msg_timeout_t kTimeoutMs = 50; - kern_return_t kr = - MachMessageServer::Run(&universal_mach_exc_server, - local_port, - kMachMessageReceiveAuditTrailer, - MachMessageServer::kOneShot, - MachMessageServer::kReceiveLargeError, - kTimeoutMs); + kr = MachMessageServer::Run(&universal_mach_exc_server, + local_port, + kMachMessageReceiveAuditTrailer, + MachMessageServer::kOneShot, + MachMessageServer::kReceiveLargeError, + kTimeoutMs); EXPECT_EQ(kr, KERN_SUCCESS) << MachErrorMessage(kr, "MachMessageServer::Run");