commit 6f4112cf4cd27cdc7aff16ac2ad9f83989f7df7b
author Peter Kasting <pkasting@chromium.org> Thu Oct 21 06:15:40 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Oct 21 09:56:58 2021 -0700
tree 2672ded10e7433b970696b12d6b09acc08bfd1eb
parent 207f78cd34d39b1e140f0fca3e056ed9da82a5d6

Fix an instance of -Wshadow.

Bug: chromium:794619
Change-Id: Ic96fff8478f10aadd5dc0dc258567bdde727ef6f
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3236044
Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
GitOrigin-RevId: 164b41de765ae593a8a3fcfb718f9865438b91ff

client/crash_report_database_generic.cc

diff --git a/client/crash_report_database_generic.cc b/client/crash_report_database_generic.cc
index a433a90..046e82d 100644
--- a/client/crash_report_database_generic.cc
+++ b/client/crash_report_database_generic.cc
@@ -342,23 +342,23 @@
   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<FileReader> reader(std::make_unique<FileReader>());
-    if (!reader->Open(filepath)) {
+    std::unique_ptr<FileReader> file_reader(std::make_unique<FileReader>());
+    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();
   }
 }