From 76405b796c436d0af81b7daa12820ea06b344aec Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <brad@danga.com>
Date: Sun, 23 Nov 2014 07:43:09 -0800
Subject: [PATCH] netutil: minor doc and style tweaks

Change-Id: I9c5706d62dc7c56785c95a444cc2bb3da1d8e571
---
 pkg/netutil/netutil.go | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkg/netutil/netutil.go b/pkg/netutil/netutil.go
index 2a341c270..b7bfb2cc7 100644
--- a/pkg/netutil/netutil.go
+++ b/pkg/netutil/netutil.go
@@ -69,17 +69,14 @@ func HostPort(urlStr string) (string, error) {
 	return hostPort, nil
 }
 
-// ListenOnLocalRandomPort returns a tcp listener on a local (see LoopbackIP) random port.
+// ListenOnLocalRandomPort returns a TCP listener on a random
+// localhost port.
 func ListenOnLocalRandomPort() (net.Listener, error) {
 	ip, err := Localhost()
 	if err != nil {
 		return nil, err
 	}
-	l, err := net.ListenTCP("tcp", &net.TCPAddr{IP: ip, Port: 0})
-	if err != nil {
-		return nil, err
-	}
-	return l, nil
+	return net.ListenTCP("tcp", &net.TCPAddr{IP: ip, Port: 0})
 }
 
 // Localhost returns the first address found when
@@ -103,20 +100,17 @@ func localhostLookup() net.IP {
 	return nil
 }
 
-const flagUpLoopback = net.FlagUp | net.FlagLoopback
-
-// loopbackIP finds the first loopback IP address sniffing network interfaces.
+// loopbackIP returns the first loopback IP address sniffing network
+// interfaces or nil if none is found.
 func loopbackIP() net.IP {
 	interfaces, err := net.Interfaces()
 	if err != nil {
 		return nil
 	}
 	for _, inf := range interfaces {
+		const flagUpLoopback = net.FlagUp | net.FlagLoopback
 		if inf.Flags&flagUpLoopback == flagUpLoopback {
-			addrs, err := inf.Addrs()
-			if err != nil {
-				continue
-			}
+			addrs, _ := inf.Addrs()
 			for _, addr := range addrs {
 				ip, _, err := net.ParseCIDR(addr.String())
 				if err == nil && ip.IsLoopback() {