]> Cypherpunks repositories - gostls13.git/commitdiff
net: fix typo in error message of TCPConn.ReadFrom
authorMikio Hara <mikioh.mikioh@gmail.com>
Tue, 26 Jul 2016 03:22:45 +0000 (12:22 +0900)
committerMikio Hara <mikioh.mikioh@gmail.com>
Tue, 23 Aug 2016 14:15:02 +0000 (14:15 +0000)
On some error when using io.Copy with TCPConn, it displays an error
correlation like the following:

read tcp 192.0.2.1:1111->192.0.2.2:2222: read tcp [2001:db8::2]:2222->[2001:db8::3]:3333 read: connection reset by peer

the correlation "some error on reading after reading operation" looks a
bit confusing because the operation on the ReadFrom method of TCPConn is
actually "writing after reading." To clarify and avoid confusion, this
change sets "readfrom" to the Op field of outer-most OpError instead of
"read."

Change-Id: I6bf4e2e7247143fa54bbcf9cef7a8ae1ede1b35c
Reviewed-on: https://go-review.googlesource.com/25220
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
src/net/tcpsock.go

index 7cffcc58cbbe83b51e5e5edf525ff448058e4ab2..ce6e009451f46494c7d777e4802340a3b8301ecc 100644 (file)
@@ -81,7 +81,7 @@ func (c *TCPConn) ReadFrom(r io.Reader) (int64, error) {
        }
        n, err := c.readFrom(r)
        if err != nil && err != io.EOF {
-               err = &OpError{Op: "read", Net: c.fd.net, Source: c.fd.laddr, Addr: c.fd.raddr, Err: err}
+               err = &OpError{Op: "readfrom", Net: c.fd.net, Source: c.fd.laddr, Addr: c.fd.raddr, Err: err}
        }
        return n, err
 }