Minor code cleanup

picker.go

@@ -9,35 +9,35 @@ import (
 func (label *Label) Picker(qtype uint16, max int) Records {
 
 	if qtype == dns.TypeANY {
-		result := make([]Record, 0)
+		var result []Record
 		for rtype := range label.Records {
 
-			rtype_records := label.Picker(rtype, max)
+			rtypeRecords := label.Picker(rtype, max)
 
-			tmp_result := make(Records, len(result)+len(rtype_records))
+			tmpResult := make(Records, len(result)+len(rtypeRecords))
 
-			copy(tmp_result, result)
-			copy(tmp_result[len(result):], rtype_records)
-			result = tmp_result
+			copy(tmpResult, result)
+			copy(tmpResult[len(result):], rtypeRecords)
+			result = tmpResult
 		}
 
 		return result
 	}
 
-	if label_rr := label.Records[qtype]; label_rr != nil {
+	if labelRR := label.Records[qtype]; labelRR != nil {
 
 		// not "balanced", just return all
 		if label.Weight[qtype] == 0 {
-			return label_rr
+			return labelRR
 		}
 
-		rr_count := len(label_rr)
-		if max > rr_count {
-			max = rr_count
+		rrCount := len(labelRR)
+		if max > rrCount {
+			max = rrCount
 		}
 
-		servers := make([]Record, len(label_rr))
-		copy(servers, label_rr)
+		servers := make([]Record, len(labelRR))
+		copy(servers, labelRR)
 		result := make([]Record, max)
 		sum := label.Weight[qtype]
 

targeting_test.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"net"
 	. "gopkg.in/check.v1"
+	"net"
 )
 
 type TargetingSuite struct {
@@ -15,15 +15,13 @@ func (s *TargetingSuite) SetUpSuite(c *C) {
 }
 
 func (s *TargetingSuite) TestTargetString(c *C) {
-	var tgt TargetOptions
-	tgt = TargetGlobal + TargetCountry + TargetContinent
+	tgt := TargetOptions(TargetGlobal + TargetCountry + TargetContinent)
 
 	str := tgt.String()
 	c.Check(str, Equals, "@ continent country")
 }
 
 func (s *TargetingSuite) TestTargetParse(c *C) {
-
 	tgt, err := parseTargets("@ foo country")
 	str := tgt.String()
 	c.Check(str, Equals, "@ country")

zone.go

@@ -126,9 +126,7 @@ func (z *Zone) SoaRR() dns.RR {
 // first available qType at each targeting level. Return a Label
 // and the qtype that was "found"
 func (z *Zone) findLabels(s string, targets []string, qts qTypes) (*Label, uint16) {
-
 	for _, target := range targets {
-
 		var name string
 
 		switch target {
@@ -143,9 +141,8 @@ func (z *Zone) findLabels(s string, targets []string, qts qTypes) (*Label, uint1
 		}
 
 		if label, ok := z.Labels[name]; ok {
-
+			var name string
 			for _, qtype := range qts {
-
 				switch qtype {
 				case dns.TypeANY:
 					// short-circuit mostly to avoid subtle bugs later

zones.go

@@ -159,7 +159,6 @@ func readZoneFile(zoneName, fileName string) (zone *Zone, zerr error) {
 		//log.Printf("k: %s v: %#v, T: %T\n", k, v, v)
 
 		switch k {
-
 		case "ttl":
 			zone.Options.Ttl = valueToInt(v)
 		case "serial":
@@ -219,7 +218,6 @@ func readZoneFile(zoneName, fileName string) (zone *Zone, zerr error) {
 }
 
 func setupZoneData(data map[string]interface{}, Zone *Zone) {
-
 	recordTypes := map[string]uint16{
 		"a":     dns.TypeA,
 		"aaaa":  dns.TypeAAAA,
@@ -233,7 +231,6 @@ func setupZoneData(data map[string]interface{}, Zone *Zone) {
 	}
 
 	for dk, dv_inter := range data {
-
 		dv := dv_inter.(map[string]interface{})
 
 		//log.Printf("K %s V %s TYPE-V %T\n", dk, dv, dv)
@@ -241,7 +238,6 @@ func setupZoneData(data map[string]interface{}, Zone *Zone) {
 		label := Zone.AddLabel(dk)
 
 		for rType, rdata := range dv {
-
 			switch rType {
 			case "max_hosts":
 				label.MaxHosts = valueToInt(rdata)
@@ -291,7 +287,6 @@ func setupZoneData(data map[string]interface{}, Zone *Zone) {
 			label.Records[dnsType] = make(Records, len(records[rType]))
 
 			for i := 0; i < len(records[rType]); i++ {
-
 				//log.Printf("RT %T %#v\n", records[rType][i], records[rType][i])
 
 				record := new(Record)
@@ -524,14 +519,13 @@ func setupZoneData(data map[string]interface{}, Zone *Zone) {
 }
 
 func getStringWeight(rec []interface{}) (string, int) {
-
 	str := rec[0].(string)
 	var weight int
-	var err error
 
 	if len(rec) > 1 {
 		switch rec[1].(type) {
 		case string:
+			var err error
 			weight, err = strconv.Atoi(rec[1].(string))
 			if err != nil {
 				panic("Error converting weight to integer")