summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-05-16 00:26:09 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-05-16 00:26:09 +0000
commite814b43c581b16e144328c405a003ffece9ebf4d (patch)
treeae4be5525cdb1dae3f05422b1b0f59e1235cfad3
parent553cbb254478e7875aa3e4a95838b1811095e328 (diff)
parent997abb668b9248c2174c6cf169a0b7c6a02fd2cb (diff)
downloadframeworks_native-e814b43c581b16e144328c405a003ffece9ebf4d.zip
frameworks_native-e814b43c581b16e144328c405a003ffece9ebf4d.tar.gz
frameworks_native-e814b43c581b16e144328c405a003ffece9ebf4d.tar.bz2
Merge "Don't use TEMP_FAILURE_RETRY on close in frameworks/native."
-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 4fc23aa..44ba025 100644
--- a/cmds/dumpstate/utils.c
+++ b/cmds/dumpstate/utils.c
@@ -306,7 +306,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");