diff options
author | Russ Cox <rsc@golang.org> | 2009-02-15 14:18:39 -0800 |
---|---|---|
committer | Russ Cox <rsc@golang.org> | 2009-02-15 14:18:39 -0800 |
commit | e61ee0bb7bec30ab196f51f90e97ae05dadf100b (patch) | |
tree | 3438f481a6b8a30aa83ed69188d0d61313291003 /src/lib/net/dnsclient.go | |
parent | dbaaba236fc383e49e95029934d335949f363682 (diff) | |
download | golang-e61ee0bb7bec30ab196f51f90e97ae05dadf100b.tar.gz |
cleanups:
get rid of _ on private names in net.
fix os_test file name list.
newline not needed on Errorf.
R=r
DELTA=305 (34 added, 2 deleted, 269 changed)
OCL=25047
CL=25047
Diffstat (limited to 'src/lib/net/dnsclient.go')
-rw-r--r-- | src/lib/net/dnsclient.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/net/dnsclient.go b/src/lib/net/dnsclient.go index 22d2684aa..499d3663a 100644 --- a/src/lib/net/dnsclient.go +++ b/src/lib/net/dnsclient.go @@ -84,7 +84,7 @@ func _Exchange(cfg *DNS_Config, c Conn, name string) (m *DNS_Msg, err *os.Error) // Find answer for name in dns message. // On return, if err == nil, addrs != nil. // TODO(rsc): Maybe return [][]byte (==[]IPAddr) instead? -func _Answer(name string, dns *DNS_Msg) (addrs []string, err *os.Error) { +func answer(name string, dns *DNS_Msg) (addrs []string, err *os.Error) { addrs = make([]string, 0, len(dns.answer)); if dns.rcode == DNS_RcodeNameError && dns.authoritative { @@ -134,8 +134,8 @@ Cname: } // Do a lookup for a single name, which must be rooted -// (otherwise _Answer will not find the answers). -func _TryOneName(cfg *DNS_Config, name string) (addrs []string, err *os.Error) { +// (otherwise answer will not find the answers). +func tryOneName(cfg *DNS_Config, name string) (addrs []string, err *os.Error) { err = DNS_NoServers; for i := 0; i < len(cfg.servers); i++ { // Calling Dial here is scary -- we have to be sure @@ -155,7 +155,7 @@ func _TryOneName(cfg *DNS_Config, name string) (addrs []string, err *os.Error) { err = merr; continue; } - addrs, aerr := _Answer(name, msg); + addrs, aerr := answer(name, msg); if aerr != nil && aerr != DNS_NameNotFound { err = aerr; continue; @@ -167,7 +167,7 @@ func _TryOneName(cfg *DNS_Config, name string) (addrs []string, err *os.Error) { var cfg *DNS_Config -func _LoadConfig() { +func loadConfig() { cfg = DNS_ReadConfig(); } @@ -175,7 +175,7 @@ func LookupHost(name string) (name1 string, addrs []string, err *os.Error) { // TODO(rsc): Pick out obvious non-DNS names to avoid // sending stupid requests to the server? - once.Do(_LoadConfig); + once.Do(loadConfig); if cfg == nil { err = DNS_MissingConfig; return; @@ -190,7 +190,7 @@ func LookupHost(name string) (name1 string, addrs []string, err *os.Error) { rname += "."; } // Can try as ordinary name. - addrs, aerr := _TryOneName(cfg, rname); + addrs, aerr := tryOneName(cfg, rname); if aerr == nil { return rname, addrs, nil; } @@ -206,7 +206,7 @@ func LookupHost(name string) (name1 string, addrs []string, err *os.Error) { if newname[len(newname)-1] != '.' { newname += "." } - addrs, aerr := _TryOneName(cfg, newname); + addrs, aerr := tryOneName(cfg, newname); if aerr == nil { return newname, addrs, nil; } |