Change the name of the result variable so that it does not

hide the package "ip".

R=rsc
DELTA=1  (0 added, 0 deleted, 1 changed)
OCL=15914
CL=15914

diff --git a/src/lib/net/net.go b/src/lib/net/net.go
index 6e8f302c2ef0b434c185a07e6c6e65a88d7e84e6..55fc98a8d04e90db57f2ed2151323bff288b51ba 100644 (file)
--- a/src/lib/net/net.go
+++ b/src/lib/net/net.go
@@ -81,7 +81,7 @@ func dtoi(s string) (n int, ok bool) {
 // Convert "host:port" into IP address and port.
 // For now, host and port must be numeric literals.
 // Eventually, we'll have name resolution.
-func HostPortToIP(net string, hostport string) (ip *[]byte, iport int, err *os.Error) {
+func HostPortToIP(net string, hostport string) (ipaddr *[]byte, iport int, err *os.Error) {
        var host, port string;
        host, port, err = SplitHostPort(hostport);
        if err != nil {