From e0fb2abe85c2bd749e238e91fa397bc5205ce305 Mon Sep 17 00:00:00 2001
From: Miek Gieben <miek@miek.nl>
Date: Mon, 7 Mar 2011 09:51:20 +0100
Subject: [PATCH] remove err from the function and kill the println

---
 resolver.go | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/resolver.go b/resolver.go
index 328639e2..dab454a2 100644
--- a/resolver.go
+++ b/resolver.go
@@ -112,7 +112,6 @@ type Xfr struct {
 // Channel m is closed when the IXFR ends.
 func (res *Resolver) Ixfr(q *Msg, m chan Xfr) {
 	var port string
-	var err os.Error
 	var in *Msg
 	var x Xfr
 	if res.Port == "" {
@@ -124,8 +123,6 @@ func (res *Resolver) Ixfr(q *Msg, m chan Xfr) {
                 res.Rtt = make(map[string]int64)
         }
 
-	var _ = err // TODO(mg)
-
 	if q.Id == 0 {
 		q.Id = Id()
 	}
@@ -139,9 +136,8 @@ func (res *Resolver) Ixfr(q *Msg, m chan Xfr) {
 Server:
 	for i := 0; i < len(res.Servers); i++ {
 		server := res.Servers[i] + ":" + port
-		c, cerr := net.Dial("tcp", "", server)
-		if cerr != nil {
-			err = cerr
+		c, err := net.Dial("tcp", "", server)
+		if err != nil {
 			continue Server
 		}
 		first := true
@@ -150,14 +146,13 @@ Server:
 		defer c.Close()
 		for {
 			if first {
-				in, cerr = exchangeTCP(c, sending, res, true)
+				in, err = exchangeTCP(c, sending, res, true)
 			} else {
 				in, err = exchangeTCP(c, sending, res, false)
 			}
 
-			if cerr != nil {
+			if err != nil {
 				// Failed to send, try the next
-				err = cerr
 				c.Close()
 				continue Server
 			}
@@ -223,7 +218,6 @@ Server:
 // The channel is closed to signal the end of the AXFR.
 func (res *Resolver) Axfr(q *Msg, m chan Xfr) {
 	var port string
-	var err os.Error
 	var in *Msg
 	if res.Port == "" {
 		port = "53"
@@ -234,8 +228,6 @@ func (res *Resolver) Axfr(q *Msg, m chan Xfr) {
                 res.Rtt = make(map[string]int64)
         }
 
-	var _ = err // TODO(mg)
-
 	if q.Id == 0 {
 		q.Id = Id()
 	}
@@ -248,25 +240,22 @@ func (res *Resolver) Axfr(q *Msg, m chan Xfr) {
 Server:
 	for i := 0; i < len(res.Servers); i++ {
 		server := res.Servers[i] + ":" + port
-		c, cerr := net.Dial("tcp", "", server)
-		if cerr != nil {
-			err = cerr
+		c, err := net.Dial("tcp", "", server)
+		if err != nil {
 			continue Server
 		}
 		first := true
 		defer c.Close() // TODO(mg): if not open?
 		for {
 			if first {
-				in, cerr = exchangeTCP(c, sending, res, true)
+				in, err = exchangeTCP(c, sending, res, true)
 			} else {
 				in, err = exchangeTCP(c, sending, res, false)
 			}
 
-			if cerr != nil {
+			if err != nil {
 				// Failed to send, try the next
-				err = cerr
 				c.Close()
-				println("AGIAIN")
 				continue Server
 			}
 			if in.Id != q.Id {