internal/poll: Avoid evaluating condition for an unreachable branch

Change-Id: I868dcaf84767d631bc8f1b6ef6bcb3ec18047259
Reviewed-on: https://go-review.googlesource.com/116135
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

diff --git a/src/internal/poll/sendfile_bsd.go b/src/internal/poll/sendfile_bsd.go
index 980a75afa7fc322e8202df77ba59f30cc8f1eb51..40ae3468b07450a644954bb996488561655f9e6c 100644 (file)
--- a/src/internal/poll/sendfile_bsd.go
+++ b/src/internal/poll/sendfile_bsd.go
@@ -32,8 +32,7 @@ func SendFile(dstFD *FD, src int, pos, remain int64) (int64, error) {
                        pos += int64(n)
                        written += int64(n)
                        remain -= int64(n)
-               }
-               if n == 0 && err1 == nil {
+               } else if n == 0 && err1 == nil {
                        break
                }
                if err1 == syscall.EAGAIN {

diff --git a/src/internal/poll/sendfile_linux.go b/src/internal/poll/sendfile_linux.go
index 52955a19d0b4fcc89d67a85ed3143f726c691f45..8e938065f17ad3685b068ab446561163b962d193 100644 (file)
--- a/src/internal/poll/sendfile_linux.go
+++ b/src/internal/poll/sendfile_linux.go
@@ -29,8 +29,7 @@ func SendFile(dstFD *FD, src int, remain int64) (int64, error) {
                if n > 0 {
                        written += int64(n)
                        remain -= int64(n)
-               }
-               if n == 0 && err1 == nil {
+               } else if n == 0 && err1 == nil {
                        break
                }
                if err1 == syscall.EAGAIN {

diff --git a/src/internal/poll/sendfile_solaris.go b/src/internal/poll/sendfile_solaris.go
index 9093d464834f4fdb88517dd26da26c56fd7d0948..762992e9eb398eac2b0ec7ec9eda78466a831ab4 100644 (file)
--- a/src/internal/poll/sendfile_solaris.go
+++ b/src/internal/poll/sendfile_solaris.go
@@ -39,8 +39,7 @@ func SendFile(dstFD *FD, src int, pos, remain int64) (int64, error) {
                        pos += int64(n)
                        written += int64(n)
                        remain -= int64(n)
-               }
-               if n == 0 && err1 == nil {
+               } else if n == 0 && err1 == nil {
                        break
                }
                if err1 == syscall.EAGAIN {