From 164b41de765ae593a8a3fcfb718f9865438b91ff Mon Sep 17 00:00:00 2001 From: Peter Kasting Date: Thu, 21 Oct 2021 06:15:40 -0700 Subject: [PATCH] Fix an instance of -Wshadow. Bug: chromium:794619 Change-Id: I4561b1019d9aeee6c25d1d4083b977d0a05abdfc Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3236044 Reviewed-by: Mark Mentovai Commit-Queue: Peter Kasting --- client/crash_report_database_generic.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/client/crash_report_database_generic.cc b/client/crash_report_database_generic.cc index a433a905..046e82d8 100644 --- a/client/crash_report_database_generic.cc +++ b/client/crash_report_database_generic.cc @@ -342,23 +342,23 @@ void CrashReportDatabase::UploadReport::InitializeAttachments() { if (!IsDirectory(attachments_dir, /*allow_symlinks=*/false)) { return; } - DirectoryReader reader; - if (!reader.Open(attachments_dir)) { + DirectoryReader directory_reader; + if (!directory_reader.Open(attachments_dir)) { return; } base::FilePath filename; DirectoryReader::Result dir_result; - while ((dir_result = reader.NextFile(&filename)) == + while ((dir_result = directory_reader.NextFile(&filename)) == DirectoryReader::Result::kSuccess) { const base::FilePath filepath(attachments_dir.Append(filename)); - std::unique_ptr reader(std::make_unique()); - if (!reader->Open(filepath)) { + std::unique_ptr file_reader(std::make_unique()); + if (!file_reader->Open(filepath)) { LOG(ERROR) << "attachment " << filepath.value() << " couldn't be opened, skipping"; continue; } - attachment_readers_.emplace_back(std::move(reader)); + attachment_readers_.emplace_back(std::move(file_reader)); attachment_map_[filename.value()] = attachment_readers_.back().get(); } }