commit 8c530317b7d4feefec6ac4ec1b0e176a8b4ff81f
author Elliott Hughes <enh@google.com> Mon Jul 18 13:55:19 2016 -0700
committer Bill Yi <byi@google.com> Fri Aug 19 15:09:28 2016 -0700
tree b908988ccbb0f60f0b43356286f9bb9ed32125f9
parent 9e7cd8408014e380a7dbe00c2646ba9282048e56

Stop using <nativehelper/ScopedFd.h>.

Bug: http://b/21192156

(cherry picked from commit 0e8c1105cad4ee8d4a71ffbd1e63a0f0710eab2d in master)

Change-Id: Icb841c7e538843f709e3fb85951d536be0a6117f

crash_collector/coredump_writer.cc

diff --git a/crash_collector/coredump_writer.cc b/crash_collector/coredump_writer.cc
index 333edd4..521f0ea 100644
--- a/crash_collector/coredump_writer.cc
+++ b/crash_collector/coredump_writer.cc
@@ -24,8 +24,8 @@
 #include <unistd.h>
 
 #include <android-base/file.h>
+#include <android-base/unique_fd.h>
 #include <log/logger.h>
-#include <nativehelper/ScopedFd.h>
 
 // From external/google-breakpad.
 #include "common/linux/elf_core_dump.h"
@@ -114,15 +114,16 @@
 }
 
 ssize_t CoredumpWriter::WriteCoredump() {
-  ScopedFd fd_dest(TEMP_FAILURE_RETRY(open(coredump_filename_.c_str(),
-                                           O_WRONLY | O_CREAT | O_EXCL,
-                                           S_IRUSR | S_IWUSR)));
-  if (fd_dest.get() == -1) {
+  android::base::unique_fd fd_dest(
+      TEMP_FAILURE_RETRY(open(coredump_filename_.c_str(),
+                              O_WRONLY | O_CREAT | O_EXCL,
+                              S_IRUSR | S_IWUSR)));
+  if (fd_dest == -1) {
     ALOGE("Failed to open: %s, errno = %d", coredump_filename_.c_str(), errno);
     return -1;
   }
-  ssize_t result = WriteCoredumpToFD(fd_dest.get());
-  fd_dest.reset();
+  ssize_t result = WriteCoredumpToFD(fd_dest);
+  fd_dest.reset(-1);
   if (result == -1)
     unlink(coredump_filename_.c_str());
   return result;
@@ -371,25 +372,25 @@
     return false;
   }
 
-  ScopedFd fd(TEMP_FAILURE_RETRY(open(
+  android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(
       output_path.c_str(), O_WRONLY | O_CREAT | O_CLOEXEC | O_EXCL,
       S_IRUSR | S_IWUSR)));
-  if (fd.get() == -1) {
+  if (fd == -1) {
     ALOGE("Failed to open %s", output_path.c_str());
     return false;
   }
   // The contents of NT_AUXV is in the same format as that of /proc/[pid]/auxv.
   return android::base::WriteFully(
-      fd.get(), note.GetDescription().data(), note.GetDescription().length());
+      fd, note.GetDescription().data(), note.GetDescription().length());
 }
 
 bool CoredumpWriter::WriteMaps(const std::vector<Phdr>& program_headers,
                                const FileMappings& file_mappings,
                                const std::string& output_path) {
-  ScopedFd fd(TEMP_FAILURE_RETRY(open(
+  android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(
       output_path.c_str(), O_WRONLY | O_CREAT | O_CLOEXEC | O_EXCL,
       S_IRUSR | S_IWUSR)));
-  if (fd.get() == -1) {
+  if (fd == -1) {
     ALOGE("Failed to open %s", output_path.c_str());
     return false;
   }
@@ -418,7 +419,7 @@
         0,  // Fake inode value.
         path.c_str());
     if (len < 0 || len > kBufSize ||
-        !android::base::WriteFully(fd.get(), buf, len)) {
+        !android::base::WriteFully(fd, buf, len)) {
       return false;
     }
   }