From 4333d3823dd78f755f90e5f63b7de180d4a90025 Mon Sep 17 00:00:00 2001 From: Mikio Hara Date: Tue, 26 Jul 2016 12:22:45 +0900 Subject: [PATCH] net: fix typo in error message of TCPConn.ReadFrom 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 --- src/net/tcpsock.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/net/tcpsock.go b/src/net/tcpsock.go index 7cffcc58cb..ce6e009451 100644 --- a/src/net/tcpsock.go +++ b/src/net/tcpsock.go @@ -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 } -- 2.48.1