commit 912e87e91d15c35c18ce6710bf6a0b34f50b3672
author Yabin Cui <yabinc@google.com> Tue Mar 29 22:48:08 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 29 22:48:08 2016 +0000
tree e50b0004812d507742f520d61d6f879f9c4cbe3c
parent 61799baba3631f55469d2754542130255ce790cf
parent ffa3a1c222c1a8b0296f97dfa3efb35108ac6d60

Merge "uncrypt: fix call to close()." into nyc-dev

uncrypt/uncrypt.cpp

diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp
index 8003f90..2ef0935 100644
--- a/uncrypt/uncrypt.cpp
+++ b/uncrypt/uncrypt.cpp
@@ -372,7 +372,7 @@
         ALOGE("failed to fsync \"%s\": %s", tmp_map_file.c_str(), strerror(errno));
         return -1;
     }
-    if (close(mapfd.get() == -1)) {
+    if (close(mapfd.get()) == -1) {
         ALOGE("failed to close %s: %s", tmp_map_file.c_str(), strerror(errno));
         return -1;
     }
@@ -406,7 +406,7 @@
         ALOGE("failed to fsync %s: %s", dir_name.c_str(), strerror(errno));
         return -1;
     }
-    if (close(dfd.get() == -1)) {
+    if (close(dfd.get()) == -1) {
         ALOGE("failed to close %s: %s", dir_name.c_str(), strerror(errno));
         return -1;
     }