]> Cypherpunks repositories - gostls13.git/commitdiff
os: remove a redundant branch in File.Read.
authorAaron Jacobs <jacobsa@google.com>
Fri, 24 Jul 2015 04:21:11 +0000 (14:21 +1000)
committerBrad Fitzpatrick <bradfitz@golang.org>
Mon, 31 Aug 2015 04:42:04 +0000 (04:42 +0000)
All implementations of File.read ensure that n >= 0. This is usually via
fixCount, except for Windows console reads, which only ever add to n.

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

src/os/file.go

index 8c0e3ffe1ba7dd7fc86fe06aac0723a121e85424..69338ce09a965bba0ae867eead7bacabd149a12f 100644 (file)
@@ -93,9 +93,6 @@ func (f *File) Read(b []byte) (n int, err error) {
                return 0, ErrInvalid
        }
        n, e := f.read(b)
-       if n < 0 {
-               n = 0
-       }
        if n == 0 && len(b) > 0 && e == nil {
                return 0, io.EOF
        }