From: Shivansh Rai <shivansh@freebsd.org>
Date: Mon, 4 Jun 2018 11:40:43 +0000 (+0530)
Subject: internal/poll: Avoid evaluating condition for an unreachable branch
X-Git-Tag: go1.12beta1~1420
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=d05f31a3c5677467525241d4bacdb287f485d370;p=gostls13.git

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 980a75afa7..40ae3468b0 100644
--- 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 52955a19d0..8e938065f1 100644
--- 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 9093d46483..762992e9eb 100644
--- 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 {