From 3454b6bf82a7f09aa346594a5a71b1dfed3696d8 Mon Sep 17 00:00:00 2001 From: Mikio Hara Date: Sat, 19 Jan 2013 23:13:01 +0900 Subject: [PATCH] undo CL 5687057 / 58bc8aae4abb MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fortunately we have never seen the panic on sockaddrToTCP in the past year. ««« original CL description net: panic if sockaddrToTCP returns nil incorrectly Part of diagnosing the selfConnect bug TBR=dsymonds R=golang-dev CC=golang-dev https://golang.org/cl/5687057 »»» R=golang-dev, minux.ma CC=golang-dev https://golang.org/cl/7137063 --- src/pkg/net/tcpsock_posix.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/pkg/net/tcpsock_posix.go b/src/pkg/net/tcpsock_posix.go index 4f9159566f..bd5a2a2877 100644 --- a/src/pkg/net/tcpsock_posix.go +++ b/src/pkg/net/tcpsock_posix.go @@ -26,11 +26,6 @@ func sockaddrToTCP(sa syscall.Sockaddr) Addr { return &TCPAddr{IP: sa.Addr[0:], Port: sa.Port} case *syscall.SockaddrInet6: return &TCPAddr{IP: sa.Addr[0:], Port: sa.Port, Zone: zoneToString(int(sa.ZoneId))} - default: - if sa != nil { - // Diagnose when we will turn a non-nil sockaddr into a nil. - panic("unexpected type in sockaddrToTCP") - } } return nil } -- 2.48.1