commit 541b23f1d418d8f9edc0f5aec2b485b69bcf8826
author Josh Gao <jmgao@google.com> Sat Jun 09 09:22:35 2018 -0700
committer android-build-merger <android-build-merger@google.com> Sat Jun 09 09:22:35 2018 -0700
tree 5b405a96b5091c3ca77cd7daa0830fb4284ce6fb
parent 3a1d2a0ba53f85b461c98eb98ca997d81ff4ea3a
parent 26f604eb5a995331237f8dafc88900bc30b1b05b

Merge "Fix double close in GetTreeBytes." am: 142702dc82 am: 45175c437f
am: 26f604eb5a

Change-Id: I3a250a6cb64c838186fb1912191df4960e00a73f

Utils.cpp

diff --git a/Utils.cpp b/Utils.cpp
index 98e8a9b..002af03 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -545,9 +545,7 @@
         PLOG(WARNING) << "Failed to open " << path;
         return -1;
     } else {
-        uint64_t res = calculate_dir_size(dirfd);
-        close(dirfd);
-        return res;
+        return calculate_dir_size(dirfd);
     }
 }