| Index: runtime/bin/fdutils_linux.cc
|
| diff --git a/runtime/bin/fdutils_linux.cc b/runtime/bin/fdutils_linux.cc
|
| index 4bf9897fcdd6a7a2a9e837f174c86a6abe09a516..2cc20c56565ab582740e40806afb31d5ca704349 100644
|
| --- a/runtime/bin/fdutils_linux.cc
|
| +++ b/runtime/bin/fdutils_linux.cc
|
| @@ -32,7 +32,6 @@ bool FDUtils::SetCloseOnExec(intptr_t fd) {
|
| return true;
|
| }
|
|
|
| -
|
| static bool SetBlockingHelper(intptr_t fd, bool blocking) {
|
| intptr_t status;
|
| status = NO_RETRY_EXPECTED(fcntl(fd, F_GETFL));
|
| @@ -48,17 +47,14 @@ static bool SetBlockingHelper(intptr_t fd, bool blocking) {
|
| return true;
|
| }
|
|
|
| -
|
| bool FDUtils::SetNonBlocking(intptr_t fd) {
|
| return SetBlockingHelper(fd, false);
|
| }
|
|
|
| -
|
| bool FDUtils::SetBlocking(intptr_t fd) {
|
| return SetBlockingHelper(fd, true);
|
| }
|
|
|
| -
|
| bool FDUtils::IsBlocking(intptr_t fd, bool* is_blocking) {
|
| intptr_t status;
|
| status = NO_RETRY_EXPECTED(fcntl(fd, F_GETFL));
|
| @@ -69,7 +65,6 @@ bool FDUtils::IsBlocking(intptr_t fd, bool* is_blocking) {
|
| return true;
|
| }
|
|
|
| -
|
| intptr_t FDUtils::AvailableBytes(intptr_t fd) {
|
| int available; // ioctl for FIONREAD expects an 'int*' argument.
|
| int result = NO_RETRY_EXPECTED(ioctl(fd, FIONREAD, &available));
|
| @@ -80,7 +75,6 @@ intptr_t FDUtils::AvailableBytes(intptr_t fd) {
|
| return static_cast<intptr_t>(available);
|
| }
|
|
|
| -
|
| ssize_t FDUtils::ReadFromBlocking(int fd, void* buffer, size_t count) {
|
| #ifdef DEBUG
|
| bool is_blocking = false;
|
| @@ -108,7 +102,6 @@ ssize_t FDUtils::ReadFromBlocking(int fd, void* buffer, size_t count) {
|
| return count;
|
| }
|
|
|
| -
|
| ssize_t FDUtils::WriteToBlocking(int fd, const void* buffer, size_t count) {
|
| #ifdef DEBUG
|
| bool is_blocking = false;
|
| @@ -137,7 +130,6 @@ ssize_t FDUtils::WriteToBlocking(int fd, const void* buffer, size_t count) {
|
| return count;
|
| }
|
|
|
| -
|
| void FDUtils::SaveErrorAndClose(intptr_t fd) {
|
| int err = errno;
|
| VOID_TEMP_FAILURE_RETRY(close(fd));
|
|
|