summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-05-15 17:05:40 -0700
committerElliott Hughes <enh@google.com>2015-05-15 17:26:44 -0700
commitbfb1f1cc832840b7232c25a91d49eb39aa79687f (patch)
tree1cd5d1310dcc0ad60dc2efb8831abd255f9bcad2 /cmds
parent2c237ee1d5961b9d11618e0c5a97b3bb7fb694b2 (diff)
downloadframeworks_native-bfb1f1cc832840b7232c25a91d49eb39aa79687f.zip
frameworks_native-bfb1f1cc832840b7232c25a91d49eb39aa79687f.tar.gz
frameworks_native-bfb1f1cc832840b7232c25a91d49eb39aa79687f.tar.bz2
Don't use TEMP_FAILURE_RETRY on close in frameworks/native.
Bug: http://b/20501816 Change-Id: Id13a62f02243c6c4831e2f47944dc34fa822f5b6 (cherry picked from commit 997abb668b9248c2174c6cf169a0b7c6a02fd2cb)
Diffstat (limited to 'cmds')
-rw-r--r--cmds/bugreport/bugreport.cpp2
-rw-r--r--cmds/dumpstate/utils.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmds/bugreport/bugreport.cpp b/cmds/bugreport/bugreport.cpp
index b606406..6892b57 100644
--- a/cmds/bugreport/bugreport.cpp
+++ b/cmds/bugreport/bugreport.cpp
@@ -86,6 +86,6 @@ int main() {
} while (bytes_written != 0 && bytes_to_send > 0);
}
- TEMP_FAILURE_RETRY(close(s));
+ close(s);
return 0;
}
diff --git a/cmds/dumpstate/utils.c b/cmds/dumpstate/utils.c
index 5801de1..d679787 100644
--- a/cmds/dumpstate/utils.c
+++ b/cmds/dumpstate/utils.c
@@ -290,7 +290,7 @@ static int _dump_file_from_fd(const char *title, const char *path, int fd) {
}
}
}
- TEMP_FAILURE_RETRY(close(fd));
+ close(fd);
if (!newline) printf("\n");
if (title) printf("\n");