Cleaning code (#50)

* spelling and gofmt

* go vet

* go imports

* ineffectual assignments

* spelling

* simplified

* mike feedback

Author: chaehni

bat/bat.go

@@ -172,7 +172,7 @@ func main() {
 			}
 		}
 	}
-	
+
 	if *URL == "" {
 		usage()
 	}

bwtester/bwtestclient/bwtestclient.go

@@ -166,7 +166,7 @@ func parseBandwidth(bw string) int64 {
 		return DefaultBW
 	}
 
-	var m int64 = 1
+	var m int64
 	val := rawBw[0][:len(rawBw[0])-1]
 	suffix := rawBw[0][len(rawBw[0])-1:]
 	switch suffix {
@@ -209,7 +209,7 @@ func getDuration(duration string) int64 {
 	}
 	d := time.Second * time.Duration(a1)
 	if d > MaxDuration {
-		Check(fmt.Errorf("Duration is exceeding MaxDuration:", a1, ">", MaxDuration/time.Second))
+		Check(fmt.Errorf("Duration is exceeding MaxDuration: %d > %d", a1, MaxDuration/time.Second))
 		a1 = DefaultDuration
 	}
 	return a1

bwtester/bwtestlib/bwtestlib.go

@@ -192,7 +192,7 @@ func HandleDCConnSend(bwp *BwtestParameters, udpConnection snet.Conn) {
 				Check(err)
 			}
 		} else if int64(n) < bwp.PacketSize {
-			Check(fmt.Errorf("Insufficient number of bytes written:", n, "instead of:", bwp.PacketSize))
+			Check(fmt.Errorf("Insufficient number of bytes written: %d instead of %d", n, bwp.PacketSize))
 		}
 		i++
 	}

bwtester/bwtestserver/bwtestserver.go

@@ -259,7 +259,7 @@ func handleClients(CCConn snet.Conn, serverISDASIP string, receivePacketBuffer [
 				// An error happened, ask the client to try again in 1 second (perhaps no path to client was found)
 				sendPacketBuffer[0] = 'N'
 				sendPacketBuffer[1] = byte(1)
-				n, err = CCConn.WriteTo(sendPacketBuffer[:2], clientCCAddr)
+				CCConn.WriteTo(sendPacketBuffer[:2], clientCCAddr)
 				// Ignore error
 				continue
 			}
@@ -285,7 +285,7 @@ func handleClients(CCConn snet.Conn, serverISDASIP string, receivePacketBuffer [
 			// Send back success
 			sendPacketBuffer[0] = 'N'
 			sendPacketBuffer[1] = byte(0)
-			n, _ = CCConn.WriteTo(sendPacketBuffer[:2], clientCCAddr)
+			CCConn.WriteTo(sendPacketBuffer[:2], clientCCAddr)
 			// Ignore error
 			// Everything succeeded, now set variable that bwtest is ongoing
 			currentBwtest = clientCCAddrStr

camerapp/imagefetcher/imagefetcher.go

@@ -47,13 +47,13 @@ func fetchFileInfo(udpConnection snet.Conn) (string, uint32, time.Duration, erro
 		numRetries++
 		// Send LIST command ("L") to server
 		t0 := time.Now()
-		n, err := udpConnection.Write([]byte("L"))
+		_, err := udpConnection.Write([]byte("L"))
 		check(err)
 
 		// Read response
 		err = udpConnection.SetReadDeadline(time.Now().Add(maxWaitDelay))
 		check(err)
-		n, _, err = udpConnection.ReadFrom(packetBuffer)
+		n, _, err := udpConnection.ReadFrom(packetBuffer)
 		if err != nil {
 			// Read error, most likely Timeout
 			continue
@@ -68,7 +68,7 @@ func fetchFileInfo(udpConnection snet.Conn) (string, uint32, time.Duration, erro
 			// 	}
 			// }
 			// If it's not an snet Timeout or SCMP error, then it's something more serious and fail
-			check(err)
+			// check(err)
 		}
 		t1 := time.Now()
 		rttApprox := t1.Sub(t0)
@@ -128,7 +128,7 @@ func blockReceiver(receivedBlockChan chan uint32, udpConnection snet.Conn, fileB
 			// 	}
 			// }
 			// If it's not an snet SCMP error, then it's something more serious and fail
-			check(err)
+			// check(err)
 		}
 		if n < 10 {
 			continue

camerapp/imageserver/imageserver.go

@@ -15,8 +15,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/scionproto/scion/go/lib/snet"
 	"github.com/scionproto/scion/go/lib/sciond"
+	"github.com/scionproto/scion/go/lib/snet"
 )
 
 const (
@@ -164,7 +164,7 @@ func main() {
 			// 	}
 			// }
 			// If it's not an snet SCMP error, then it's something more serious and fail
-			check(err)
+			// check(err)
 		}
 		if n > 0 {
 			if receivePacketBuffer[0] == 'L' {
@@ -183,7 +183,7 @@ func main() {
 				binary.LittleEndian.PutUint32(sendPacketBuffer[sendLen:], currentFiles[mostRecentFile].size)
 				currentFilesLock.Unlock()
 				sendLen = sendLen + 4
-				n, err = udpConnection.WriteTo(sendPacketBuffer[:sendLen], remoteUDPaddress)
+				_, err = udpConnection.WriteTo(sendPacketBuffer[:sendLen], remoteUDPaddress)
 				check(err)
 			} else if receivePacketBuffer[0] == 'G' && n > 1 {
 				filenameLen := int(receivePacketBuffer[1])
@@ -206,7 +206,7 @@ func main() {
 						// Copy image contents
 						copy(sendPacketBuffer[9:], v.content[startByte:endByte])
 						sendLen := 9 + endByte - startByte
-						n, err = udpConnection.WriteTo(sendPacketBuffer[:sendLen], remoteUDPaddress)
+						_, err = udpConnection.WriteTo(sendPacketBuffer[:sendLen], remoteUDPaddress)
 						check(err)
 					}
 				}

lib/scionutil/hosts_test.go

@@ -89,13 +89,13 @@ func TestReadHosts(t *testing.T) {
 	}
 	addr = &snet.Addr{IA: ia, Host: &libaddr.AppAddr{L3: l3, L4: libaddr.NewL4UDPInfo(0)}}
 
-	expected, err = snet.AddrFromString("20-ffaa:c0ff:ee12,[::ff1:ce00:dead:10cc:baad:f00d]:0")
+	expected, _ = snet.AddrFromString("20-ffaa:c0ff:ee12,[::ff1:ce00:dead:10cc:baad:f00d]:0")
 	if !addr.EqAddr(expected) {
 		t.Errorf("host resolved to wrong address, expected: %q, received: %q", "20-ffaa:c0ff:ee12,[::ff1:ce00:dead:10cc:baad:f00d]:0", addr)
 	}
 
 	// does not parse commented hosts
-	ia, l3, err = GetHostByName("commented")
+	_, _, err = GetHostByName("commented")
 	if err == nil {
 		t.Error("read commented host")
 	}

lib/scionutil/path_selection.go

@@ -105,7 +105,7 @@ func ChoosePathByMetric(pathAlgo int, local, remote *snet.Addr) *sciond.PathRepl
 func pathSelection(pathSet spathmeta.AppPathSet, pathAlgo int) *spathmeta.AppPath {
 	var selectedPath *spathmeta.AppPath
 	var metric float64
-	// A path selection algorithm consists of a simple comparision function selecting the best path according
+	// A path selection algorithm consists of a simple comparison function selecting the best path according
 	// to some path property and a metric function normalizing that property to a value in [0,1], where larger is better
 	// Available path selection algorithms, the metric returned must be normalized between [0,1]:
 	pathAlgos := map[int](func(spathmeta.AppPathSet) (*spathmeta.AppPath, float64)){

lib/shttp/examples/image_server/client.go

@@ -81,6 +81,9 @@ func main() {
 	}
 
 	out, err := os.Create("received.jpg")
+	if err != nil {
+		log.Fatal(err)
+	}
 	err = jpeg.Encode(out, img, nil)
 	if err != nil {
 		log.Fatal(err)