summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-05-16 03:17:48 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-16 03:17:48 +0200
commit09050fc92ef94a5ea0ee84f09f511850424f9216 (patch)
tree2b828269e9cfd9bd6dba137bd5fe72529f8ca175
parentam 3badd563: Merge "init sets the default PATH itself, better." (diff)
parentMerge "Don't use TEMP_FAILURE_RETRY on close in recovery." (diff)
downloadandroid_bootable_recovery-09050fc92ef94a5ea0ee84f09f511850424f9216.tar
android_bootable_recovery-09050fc92ef94a5ea0ee84f09f511850424f9216.tar.gz
android_bootable_recovery-09050fc92ef94a5ea0ee84f09f511850424f9216.tar.bz2
android_bootable_recovery-09050fc92ef94a5ea0ee84f09f511850424f9216.tar.lz
android_bootable_recovery-09050fc92ef94a5ea0ee84f09f511850424f9216.tar.xz
android_bootable_recovery-09050fc92ef94a5ea0ee84f09f511850424f9216.tar.zst
android_bootable_recovery-09050fc92ef94a5ea0ee84f09f511850424f9216.zip
-rw-r--r--updater/blockimg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/updater/blockimg.c b/updater/blockimg.c
index 532e7b845..a0e9aec6a 100644
--- a/updater/blockimg.c
+++ b/updater/blockimg.c
@@ -694,7 +694,7 @@ static int WriteStash(const char* base, const char* id, int blocks, uint8_t* buf
wsout:
if (fd != -1) {
- TEMP_FAILURE_RETRY(close(fd));
+ close(fd);
}
if (fn) {
@@ -1732,7 +1732,7 @@ pbiudone:
if (fsync(params.fd) == -1) {
fprintf(stderr, "fsync failed: %s\n", strerror(errno));
}
- TEMP_FAILURE_RETRY(close(params.fd));
+ close(params.fd);
}
if (logcmd) {