PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yabin Cui
2016-03-29 22:48:08 +00:00
committed by Android (Google) Code Review
parent 61799baba3 ffa3a1c222
commit 912e87e91d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
uncrypt/uncrypt.cpp
View File

@@ -372,7 +372,7 @@ static int produce_block_map(const char* path, const char* map_file, const char*
ALOGE("failed to fsync \"%s\": %s", tmp_map_file.c_str(), strerror(errno)); ALOGE("failed to fsync \"%s\": %s", tmp_map_file.c_str(), strerror(errno));
return -1; 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)); ALOGE("failed to close %s: %s", tmp_map_file.c_str(), strerror(errno));
return -1; return -1;
} }
@@ -406,7 +406,7 @@ static int produce_block_map(const char* path, const char* map_file, const char*
ALOGE("failed to fsync %s: %s", dir_name.c_str(), strerror(errno)); ALOGE("failed to fsync %s: %s", dir_name.c_str(), strerror(errno));
return -1; return -1;
} }
if (close(dfd.get() == -1)) { if (close(dfd.get()) == -1) {
ALOGE("failed to close %s: %s", dir_name.c_str(), strerror(errno)); ALOGE("failed to close %s: %s", dir_name.c_str(), strerror(errno));
return -1; return -1;
} }