From f023b7a997d2deeda907a70d5f74232d239b4a11 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Thu, 25 Sep 2008 17:36:37 -0700
Subject: [PATCH] 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
---
 src/lib/net/net.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/net/net.go b/src/lib/net/net.go
index 6e8f302c2ef..55fc98a8d04 100644
--- 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 {