commit 81399e1e0e9189b1b87531bfb566ba5386ab567f
author Elliott Hughes <enh@google.com> Tue Mar 10 08:39:45 2015 -0700
committer Elliott Hughes <enh@google.com> Fri Mar 20 16:03:41 2015 -0700
tree 4cf31b001d0ae333bea76ee92c6a9cb4da769a2f
parent db7a994e1687574a675ccf5d56aa76df4cd98a88

Use unique_ptr to call closedir.

Change-Id: I8f572a06ce59283e5bd444ae0491dea71b0ea304

init/bootchart.cpp

diff --git a/init/bootchart.cpp b/init/bootchart.cpp
index 530eba8..03c8b30 100644
--- a/init/bootchart.cpp
+++ b/init/bootchart.cpp
@@ -30,6 +30,7 @@
 #include <time.h>
 #include <unistd.h>
 
+#include <memory>
 #include <string>
 
 #include <base/file.h>
@@ -114,9 +115,9 @@
 static void do_log_procs(FILE* log) {
     do_log_uptime(log);
 
-    DIR* dir = opendir("/proc");
+    std::unique_ptr<DIR, int(*)(DIR*)> dir(opendir("/proc"), closedir);
     struct dirent* entry;
-    while ((entry = readdir(dir)) != NULL) {
+    while ((entry = readdir(dir.get())) != NULL) {
         // Only match numeric values.
         char* end;
         int pid = strtol(entry->d_name, &end, 10);
@@ -146,7 +147,6 @@
             }
         }
     }
-    closedir(dir);
 
     fputc('\n', log);
 }