net: make use of noDeadline instead of time.Time{}

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/11691044

diff --git a/src/pkg/net/dnsclient_unix.go b/src/pkg/net/dnsclient_unix.go
index 9e21bb4a0f66e9d28522f82b0e47d9562d3e3297..c9a16a94d84eab1237a3ffd6c1da026382b2501d 100644 (file)
--- a/src/pkg/net/dnsclient_unix.go
+++ b/src/pkg/net/dnsclient_unix.go
@@ -46,7 +46,7 @@ func exchange(cfg *dnsConfig, c Conn, name string, qtype uint16) (*dnsMsg, error
                }
 
                if cfg.timeout == 0 {
-                       c.SetReadDeadline(time.Time{})
+                       c.SetReadDeadline(noDeadline)
                } else {
                        c.SetReadDeadline(time.Now().Add(time.Duration(cfg.timeout) * time.Second))
                }

diff --git a/src/pkg/net/fd_posix_test.go b/src/pkg/net/fd_posix_test.go
index 8be0335d61ce228bc9384c3fceeab60cc2883a04..11a7eb1b80f5dfbb83507da7c1e2b0da1ca78d05 100644 (file)
--- a/src/pkg/net/fd_posix_test.go
+++ b/src/pkg/net/fd_posix_test.go
@@ -15,7 +15,7 @@ var deadlineSetTimeTests = []struct {
        input    time.Time
        expected int64
 }{
-       {time.Time{}, 0},
+       {noDeadline, 0},
        {time.Date(2009, 11, 10, 23, 00, 00, 00, time.UTC), 1257894000000000000}, // 2009-11-10 23:00:00 +0000 UTC
 }
 
@@ -42,7 +42,7 @@ var deadlineExpiredTests = []struct {
        // the start of TestDeadlineExpired
        {time.Now().Add(5 * time.Minute), false},
        {time.Now().Add(-5 * time.Minute), true},
-       {time.Time{}, false}, // no deadline set
+       {noDeadline, false},
 }
 
 func TestDeadlineExpired(t *testing.T) {

diff --git a/src/pkg/net/sock_posix.go b/src/pkg/net/sock_posix.go
index be89c26db2a38480383965b4008b5ba13a6d52e5..beaa5c8b01e1444db39135ac2359ccdc043ce82c 100644 (file)
--- a/src/pkg/net/sock_posix.go
+++ b/src/pkg/net/sock_posix.go
@@ -63,7 +63,7 @@ func socket(net string, f, t, p int, ipv6only bool, ulsa, ursa syscall.Sockaddr,
                }
                fd.isConnected = true
                if !deadline.IsZero() {
-                       setWriteDeadline(fd, time.Time{})
+                       setWriteDeadline(fd, noDeadline)
                }
        }