update tree for package net changes

Converted with gofix.

R=adg
CC=golang-dev
https://golang.org/cl/4284049

diff --git a/src/pkg/exp/draw/x11/conn.go b/src/pkg/exp/draw/x11/conn.go
index e28fb217065dfcf470c1a7ecc5198f0cb7917835..53294af15c0d95b3bf7cf367d6e1db4868d2b42d 100644 (file)
--- a/src/pkg/exp/draw/x11/conn.go
+++ b/src/pkg/exp/draw/x11/conn.go
@@ -286,11 +286,11 @@ func connect(display string) (conn net.Conn, displayStr string, err os.Error) {
        }
        // Make the connection.
        if socket != "" {
-               conn, err = net.Dial("unix", "", socket+":"+displayStr)
+               conn, err = net.Dial("unix", socket+":"+displayStr)
        } else if host != "" {
-               conn, err = net.Dial(protocol, "", host+":"+strconv.Itoa(6000+displayInt))
+               conn, err = net.Dial(protocol, host+":"+strconv.Itoa(6000+displayInt))
        } else {
-               conn, err = net.Dial("unix", "", "/tmp/.X11-unix/X"+displayStr)
+               conn, err = net.Dial("unix", "/tmp/.X11-unix/X"+displayStr)
        }
        if err != nil {
                return nil, "", os.NewError("cannot connect to " + display + ": " + err.String())

diff --git a/src/pkg/http/serve_test.go b/src/pkg/http/serve_test.go
index 683de85b8670b2134afa52f8551fae1c1dd248d3..b0e26e533596b423d0f7ffb61fa2ef6970c62967 100644 (file)
--- a/src/pkg/http/serve_test.go
+++ b/src/pkg/http/serve_test.go
@@ -175,7 +175,7 @@ func TestHostHandlers(t *testing.T) {
        ts := httptest.NewServer(nil)
        defer ts.Close()
 
-       conn, err := net.Dial("tcp", "", ts.Listener.Addr().String())
+       conn, err := net.Dial("tcp", ts.Listener.Addr().String())
        if err != nil {
                t.Fatal(err)
        }
@@ -265,7 +265,7 @@ func TestServerTimeouts(t *testing.T) {
 
        // Slow client that should timeout.
        t1 := time.Nanoseconds()
-       conn, err := net.Dial("tcp", "", fmt.Sprintf("localhost:%d", addr.Port))
+       conn, err := net.Dial("tcp", fmt.Sprintf("localhost:%d", addr.Port))
        if err != nil {
                t.Fatalf("Dial: %v", err)
        }
@@ -348,7 +348,7 @@ func TestIdentityResponse(t *testing.T) {
        }
        // Verify that the connection is closed when the declared Content-Length
        // is larger than what the handler wrote.
-       conn, err := net.Dial("tcp", "", ts.Listener.Addr().String())
+       conn, err := net.Dial("tcp", ts.Listener.Addr().String())
        if err != nil {
                t.Fatalf("error dialing: %v", err)
        }
@@ -377,7 +377,7 @@ func TestServeHTTP10Close(t *testing.T) {
        }))
        defer s.Close()
 
-       conn, err := net.Dial("tcp", "", s.Listener.Addr().String())
+       conn, err := net.Dial("tcp", s.Listener.Addr().String())
        if err != nil {
                t.Fatal("dial error:", err)
        }

diff --git a/src/pkg/http/transport.go b/src/pkg/http/transport.go
index 8a73ead31f9f855c4598232474333a87963fb527..ed7843bc713c0f6d0ca4fb35af614e0185283bca 100644 (file)
--- a/src/pkg/http/transport.go
+++ b/src/pkg/http/transport.go
@@ -195,7 +195,7 @@ func (t *Transport) getConn(cm *connectMethod) (*persistConn, os.Error) {
                return pc, nil
        }
 
-       conn, err := net.Dial("tcp", "", cm.addr())
+       conn, err := net.Dial("tcp", cm.addr())
        if err != nil {
                return nil, err
        }

diff --git a/src/pkg/netchan/import.go b/src/pkg/netchan/import.go
index 5db679a3ed6d251003ec76941e6dd38a0fd65e9d..8ba5df9a5154c957e45b41b3f45cca8dc91ec674 100644 (file)
--- a/src/pkg/netchan/import.go
+++ b/src/pkg/netchan/import.go
@@ -48,7 +48,7 @@ func NewImporter(conn io.ReadWriter) *Importer {
 
 // Import imports a set of channels from the given network and address.
 func Import(network, remoteaddr string) (*Importer, os.Error) {
-       conn, err := net.Dial(network, "", remoteaddr)
+       conn, err := net.Dial(network, remoteaddr)
        if err != nil {
                return nil, err
        }

diff --git a/src/pkg/rpc/client.go b/src/pkg/rpc/client.go
index 92372521175f81c4c1e991a5b6421f88b5b2e004..8af4afcf697ab3befd713f36825c5045bb3a1896 100644 (file)
--- a/src/pkg/rpc/client.go
+++ b/src/pkg/rpc/client.go
@@ -208,7 +208,7 @@ func DialHTTP(network, address string) (*Client, os.Error) {
 // at the specified network address and path.
 func DialHTTPPath(network, address, path string) (*Client, os.Error) {
        var err os.Error
-       conn, err := net.Dial(network, "", address)
+       conn, err := net.Dial(network, address)
        if err != nil {
                return nil, err
        }
@@ -229,7 +229,7 @@ func DialHTTPPath(network, address, path string) (*Client, os.Error) {
 
 // Dial connects to an RPC server at the specified network address.
 func Dial(network, address string) (*Client, os.Error) {
-       conn, err := net.Dial(network, "", address)
+       conn, err := net.Dial(network, address)
        if err != nil {
                return nil, err
        }

diff --git a/src/pkg/rpc/jsonrpc/client.go b/src/pkg/rpc/jsonrpc/client.go
index 5b806bd6e250ab6be94511af1ef4c4a2ad27f556..57e977d3253194c801c5252da58f86cd2d25db7e 100644 (file)
--- a/src/pkg/rpc/jsonrpc/client.go
+++ b/src/pkg/rpc/jsonrpc/client.go
@@ -116,7 +116,7 @@ func NewClient(conn io.ReadWriteCloser) *rpc.Client {
 
 // Dial connects to a JSON-RPC server at the specified network address.
 func Dial(network, address string) (*rpc.Client, os.Error) {
-       conn, err := net.Dial(network, "", address)
+       conn, err := net.Dial(network, address)
        if err != nil {
                return nil, err
        }

diff --git a/src/pkg/smtp/smtp.go b/src/pkg/smtp/smtp.go
index 2f6d2f31a78ae85c01ffbf9e0edeccf18cdb9975..3f89af147202e8f0bf3b8952afd4e5cda05c0354 100644 (file)
--- a/src/pkg/smtp/smtp.go
+++ b/src/pkg/smtp/smtp.go
@@ -39,7 +39,7 @@ type Client struct {
 
 // Dial returns a new Client connected to an SMTP server at addr.
 func Dial(addr string) (*Client, os.Error) {
-       conn, err := net.Dial("tcp", "", addr)
+       conn, err := net.Dial("tcp", addr)
        if err != nil {
                return nil, err
        }

diff --git a/src/pkg/syslog/syslog.go b/src/pkg/syslog/syslog.go
index 711d5ddc74e5f8bf2ade888c8a4c9e30eaca06d4..4ada113f1d7692260769749d9783ad3a636e6d24 100644 (file)
--- a/src/pkg/syslog/syslog.go
+++ b/src/pkg/syslog/syslog.go
@@ -67,7 +67,7 @@ func Dial(network, raddr string, priority Priority, prefix string) (w *Writer, e
                conn, err = unixSyslog()
        } else {
                var c net.Conn
-               c, err = net.Dial(network, "", raddr)
+               c, err = net.Dial(network, raddr)
                conn = netConn{c}
        }
        return &Writer{priority, prefix, conn}, err

diff --git a/src/pkg/syslog/syslog_unix.go b/src/pkg/syslog/syslog_unix.go
index b4daf88ee285af11ce974a123aac0c9ca03a096e..fa15e882d079772701bb6d5d0492420913615a17 100644 (file)
--- a/src/pkg/syslog/syslog_unix.go
+++ b/src/pkg/syslog/syslog_unix.go
@@ -19,7 +19,7 @@ func unixSyslog() (conn serverConn, err os.Error) {
        for _, network := range logTypes {
                for _, path := range logPaths {
                        raddr = path
-                       conn, err := net.Dial(network, "", raddr)
+                       conn, err := net.Dial(network, raddr)
                        if err != nil {
                                continue
                        } else {

diff --git a/src/pkg/websocket/client.go b/src/pkg/websocket/client.go
index d8a7aa0a266c916c610be46385390ec0222edf1a..78c8b7f57bfeede97a79874b4178e369ca568f21 100644 (file)
--- a/src/pkg/websocket/client.go
+++ b/src/pkg/websocket/client.go
@@ -108,10 +108,10 @@ func Dial(url, protocol, origin string) (ws *Conn, err os.Error) {
 
        switch parsedUrl.Scheme {
        case "ws":
-               client, err = net.Dial("tcp", "", parsedUrl.Host)
+               client, err = net.Dial("tcp", parsedUrl.Host)
 
        case "wss":
-               client, err = tls.Dial("tcp", "", parsedUrl.Host, nil)
+               client, err = tls.Dial("tcp", parsedUrl.Host, nil)
 
        default:
                err = ErrBadScheme

diff --git a/src/pkg/websocket/websocket_test.go b/src/pkg/websocket/websocket_test.go
index 14d708a3babd1e77ce9a7f98965c4ee839f7230e..8b3cf8925a99dfa86ca165caab7ceb03769deacf 100644 (file)
--- a/src/pkg/websocket/websocket_test.go
+++ b/src/pkg/websocket/websocket_test.go
@@ -53,7 +53,7 @@ func TestEcho(t *testing.T) {
        once.Do(startServer)
 
        // websocket.Dial()
-       client, err := net.Dial("tcp", "", serverAddr)
+       client, err := net.Dial("tcp", serverAddr)
        if err != nil {
                t.Fatal("dialing", err)
        }
@@ -84,7 +84,7 @@ func TestEchoDraft75(t *testing.T) {
        once.Do(startServer)
 
        // websocket.Dial()
-       client, err := net.Dial("tcp", "", serverAddr)
+       client, err := net.Dial("tcp", serverAddr)
        if err != nil {
                t.Fatal("dialing", err)
        }
@@ -114,7 +114,7 @@ func TestEchoDraft75(t *testing.T) {
 func TestWithQuery(t *testing.T) {
        once.Do(startServer)
 
-       client, err := net.Dial("tcp", "", serverAddr)
+       client, err := net.Dial("tcp", serverAddr)
        if err != nil {
                t.Fatal("dialing", err)
        }
@@ -131,7 +131,7 @@ func TestWithQuery(t *testing.T) {
 func TestWithProtocol(t *testing.T) {
        once.Do(startServer)
 
-       client, err := net.Dial("tcp", "", serverAddr)
+       client, err := net.Dial("tcp", serverAddr)
        if err != nil {
                t.Fatal("dialing", err)
        }
@@ -200,7 +200,7 @@ func TestSmallBuffer(t *testing.T) {
        once.Do(startServer)
 
        // websocket.Dial()
-       client, err := net.Dial("tcp", "", serverAddr)
+       client, err := net.Dial("tcp", serverAddr)
        if err != nil {
                t.Fatal("dialing", err)
        }