aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2012-01-23 11:00:10 +0100
committerHenrik Nord <[email protected]>2012-01-23 11:00:18 +0100
commitefe40df70999f798590cdbfd6648375891aa0ab0 (patch)
tree6f6f8385dce7253eb101c6122904cfd21ae5bfc3
parente0e8c6a33b6482b3de013977ca3ec579283837e5 (diff)
parent6581e8bbef00ee093fec63c59cb87c913615340a (diff)
downloadotp-efe40df70999f798590cdbfd6648375891aa0ab0.tar.gz
otp-efe40df70999f798590cdbfd6648375891aa0ab0.tar.bz2
otp-efe40df70999f798590cdbfd6648375891aa0ab0.zip
Merge branch 'jz/error-logic-efile_sendfile' into maint
* jz/error-logic-efile_sendfile: erts: minor fix for unnecessary condition OTP-9872
-rw-r--r--erts/emulator/drivers/unix/unix_efile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/drivers/unix/unix_efile.c b/erts/emulator/drivers/unix/unix_efile.c
index f4be8e6a2e..796843a735 100644
--- a/erts/emulator/drivers/unix/unix_efile.c
+++ b/erts/emulator/drivers/unix/unix_efile.c
@@ -1445,7 +1445,7 @@ efile_sendfile(Efile_error* errInfo, int in_fd, int out_fd,
written += retval;
*nbytes -= retval;
}
- } while (retval != -1 && retval == SENDFILE_CHUNK_SIZE);
+ } while (retval == SENDFILE_CHUNK_SIZE);
*nbytes = written;
return check_error(retval == -1 ? -1 : 0, errInfo);
#elif defined(__sun) && defined(__SVR4) && defined(HAVE_SENDFILEV)