summaryrefslogtreecommitdiff
path: root/src/lib/net/dnsconfig.go
diff options
context:
space:
mode:
authorRob Pike <r@golang.org>2009-04-17 00:08:24 -0700
committerRob Pike <r@golang.org>2009-04-17 00:08:24 -0700
commit3696e3e558a5be76b8af9698ff0e56719e47ec59 (patch)
treec20f34ec6f9dea967a511f65b239c5e8637fec8f /src/lib/net/dnsconfig.go
parentdf02778ccda228c665179d0ff3dac77217ad6633 (diff)
downloadgolang-3696e3e558a5be76b8af9698ff0e56719e47ec59.tar.gz
Step 1 of the Big Error Shift: make os.Error an interface and replace *os.Errors with os.Errors.
lib/template updated to use new setup; its clients also updated. Step 2 will make os's error support internally much cleaner. R=rsc OCL=27586 CL=27586
Diffstat (limited to 'src/lib/net/dnsconfig.go')
-rw-r--r--src/lib/net/dnsconfig.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/net/dnsconfig.go b/src/lib/net/dnsconfig.go
index 385d07b6a..e56d964f2 100644
--- a/src/lib/net/dnsconfig.go
+++ b/src/lib/net/dnsconfig.go
@@ -22,16 +22,16 @@ type _DNS_Config struct {
rotate bool; // round robin among servers
}
-var _DNS_configError *os.Error;
+var _DNS_configError os.Error;
// See resolv.conf(5) on a Linux machine.
// TODO(rsc): Supposed to call uname() and chop the beginning
// of the host name to get the default search domain.
// We assume it's in resolv.conf anyway.
-func _DNS_ReadConfig() (*_DNS_Config, *os.Error) {
+func _DNS_ReadConfig() (*_DNS_Config, os.Error) {
// TODO(rsc): 6g won't let me say file, err :=
var file *file;
- var err *os.Error;
+ var err os.Error;
file, err = open("/etc/resolv.conf");
if err != nil {
return nil, err