golang-cilint cleanup.

door/door.go

@@ -196,8 +196,7 @@ func (d *Door) detect() {
 	var results string
 
 	for {
-		var r int
-		r = d.getch()
+		var r int = d.getch()
 		if r < 0 {
 			break
 		}

door/door_test.go

@@ -59,10 +59,16 @@ func TestLogfileFailure(t *testing.T) {
 	// Create door32.sys file
 	dfc := DropfileConfig{2, fd, 1800, "Test BBSID", 1701, "Real Username", "Handle", 880, 28, 0, 13}
 
-	tmpFile.WriteString(fmt.Sprintf("%d\n%d\n%d\n%s\n%d\n%s\n%s\n%d\n%d\n%d\n%d\n",
+	_, err = tmpFile.WriteString(fmt.Sprintf("%d\n%d\n%d\n%s\n%d\n%s\n%s\n%d\n%d\n%d\n%d\n",
 		dfc.Comm_type, dfc.Comm_handle, dfc.Baudrate, dfc.BBSID, dfc.User_number, dfc.Real_name, dfc.Handle,
 		dfc.Security_level, dfc.Time_left, dfc.Emulation, dfc.Node))
-	tmpFile.Close()
+	if err != nil {
+		t.Error("tmpFile.WriteString:", err)
+	}
+	err = tmpFile.Close()
+	if err != nil {
+		t.Error("tmpFile.Close:", err)
+	}
 
 	d := Door{}
 
@@ -86,10 +92,16 @@ func TestReadDropFile(t *testing.T) {
 
 	dfc := DropfileConfig{2, 20, 1800, "Test BBSID", 1701, "Real Username", "Handle", 880, 28, 0, 12}
 
-	tmpFile.WriteString(fmt.Sprintf("%d\n%d\n%d\n%s\n%d\n%s\n%s\n%d\n%d\n%d\n%d\n",
+	_, err = tmpFile.WriteString(fmt.Sprintf("%d\n%d\n%d\n%s\n%d\n%s\n%s\n%d\n%d\n%d\n%d\n",
 		dfc.Comm_type, dfc.Comm_handle, dfc.Baudrate, dfc.BBSID, dfc.User_number, dfc.Real_name, dfc.Handle,
 		dfc.Security_level, dfc.Time_left, dfc.Emulation, dfc.Node))
-	tmpFile.Close()
+	if err != nil {
+		t.Error("tmpFile.WriteString:", err)
+	}
+	err = tmpFile.Close()
+	if err != nil {
+		t.Error("tmpFile.Close:", err)
+	}
 
 	d := Door{}
 	d.ReadDropfile(tmpFile.Name())
@@ -168,10 +180,16 @@ func TestDetectFail(t *testing.T) {
 	// Create door32.sys file
 	dfc := DropfileConfig{2, fd, 1800, "Test BBSID", 1701, "Real Username", "Handle", 880, 28, 0, 13}
 
-	tmpFile.WriteString(fmt.Sprintf("%d\n%d\n%d\n%s\n%d\n%s\n%s\n%d\n%d\n%d\n%d\n",
+	_, err = tmpFile.WriteString(fmt.Sprintf("%d\n%d\n%d\n%s\n%d\n%s\n%s\n%d\n%d\n%d\n%d\n",
 		dfc.Comm_type, dfc.Comm_handle, dfc.Baudrate, dfc.BBSID, dfc.User_number, dfc.Real_name, dfc.Handle,
 		dfc.Security_level, dfc.Time_left, dfc.Emulation, dfc.Node))
-	tmpFile.Close()
+	if err != nil {
+		t.Error("tmpFile.WriteString:", err)
+	}
+	err = tmpFile.Close()
+	if err != nil {
+		t.Error("tmpFile.Close:", err)
+	}
 
 	d := Door{ReaderCanClose: true}
 
@@ -191,7 +209,7 @@ func TestDetectFail(t *testing.T) {
 	os.Args = []string{"door", "-d", tmpFile.Name()}
 	d.Init("menu-test")
 
-        defer d.Close()
+	defer d.Close()
 	// clean up log file
 	// I don't need to.  Tests are run in /tmp/go-buildNNNN.
 	// defer os.Remove("menu-test-13.log")

door/input.go

@@ -325,8 +325,6 @@ func (d *Door) Input(max int) string {
 			}
 		}
 	}
-	// this is never reached
-	return line
 }
 
 func (d *Door) GetOneOf(possible string) int {

door/input_test.go

@@ -40,10 +40,16 @@ func TestDoorInputConnection(t *testing.T) {
 	// Create door32.sys file
 	dfc := DropfileConfig{2, fd, 1800, "Test BBSID", 1701, "Real Username", "Handle", 880, 28, 0, 12}
 
-	tmpFile.WriteString(fmt.Sprintf("%d\n%d\n%d\n%s\n%d\n%s\n%s\n%d\n%d\n%d\n%d\n",
+	_, err = tmpFile.WriteString(fmt.Sprintf("%d\n%d\n%d\n%s\n%d\n%s\n%s\n%d\n%d\n%d\n%d\n",
 		dfc.Comm_type, dfc.Comm_handle, dfc.Baudrate, dfc.BBSID, dfc.User_number, dfc.Real_name, dfc.Handle,
 		dfc.Security_level, dfc.Time_left, dfc.Emulation, dfc.Node))
-	tmpFile.Close()
+	if err != nil {
+		t.Error("tmpFile.WriteString:", err)
+	}
+	err = tmpFile.Close()
+	if err != nil {
+		t.Error("tmpFile.Close:", err)
+	}
 
 	d := Door{ReaderCanClose: true}
 

door/menu_test.go

@@ -79,10 +79,16 @@ func TestMenuConnection(t *testing.T) {
 	// Create door32.sys file
 	var dfc DropfileConfig = DropfileConfig{2, fd, 1800, "Test BBSID", 1701, "Real Username", "Handle", 880, 28, 0, 12}
 
-	tmpFile.WriteString(fmt.Sprintf("%d\n%d\n%d\n%s\n%d\n%s\n%s\n%d\n%d\n%d\n%d\n",
+	_, err = tmpFile.WriteString(fmt.Sprintf("%d\n%d\n%d\n%s\n%d\n%s\n%s\n%d\n%d\n%d\n%d\n",
 		dfc.Comm_type, dfc.Comm_handle, dfc.Baudrate, dfc.BBSID, dfc.User_number, dfc.Real_name, dfc.Handle,
 		dfc.Security_level, dfc.Time_left, dfc.Emulation, dfc.Node))
-	tmpFile.Close()
+	if err != nil {
+		t.Error("tmpFile.WriteString:", err)
+	}
+	err = tmpFile.Close()
+	if err != nil {
+		t.Error("tmpFile.Close:", err)
+	}
 
 	var d Door = Door{ReaderCanClose: true}
 	// If I call d.Init() more then once flag complains about flag redefined.
@@ -211,7 +217,7 @@ func TestMenuConnection(t *testing.T) {
 
 	// Read the display output
 	server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
-	r, err = server.Read(buffer)
+	_, err = server.Read(buffer)
 	if err != nil {
 		t.Errorf("server.Read: %s", err)
 	}
@@ -245,7 +251,7 @@ func TestMenuConnection(t *testing.T) {
 
 	// Read the display output
 	server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
-	r, err = server.Read(buffer)
+	_, err = server.Read(buffer)
 	if err != nil {
 		t.Errorf("server.Read: %s", err)
 	}
@@ -272,7 +278,7 @@ func TestMenuConnection(t *testing.T) {
 
 	// Read the display output
 	server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
-	r, err = server.Read(buffer)
+	_, err = server.Read(buffer)
 	if err != nil {
 		t.Errorf("server.Read: %s", err)
 	}
@@ -301,7 +307,7 @@ func TestMenuConnection(t *testing.T) {
 
 	// i/o timeout
 	server.SetReadDeadline(time.Now().Add(time.Millisecond * 100))
-	r, err = server.Read(buffer)
+	_, err = server.Read(buffer)
 	if err != nil {
 		t.Errorf("server.Read: %s", err)
 	}
@@ -329,7 +335,7 @@ func TestMenuConnection(t *testing.T) {
 
 	// Read the display output
 	server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
-	r, err = server.Read(buffer)
+	_, err = server.Read(buffer)
 	if err != nil {
 		t.Errorf("server.Read: %s", err)
 	}

door/nomoresecrets.go

@@ -154,7 +154,7 @@ func NoMoreSecrets(output string, Door *Door, config *NoMoreSecretsConfig) {
 					work = append(work, ANSIrunes...)
 					workpos += len(ANSIrunes)
 				}
-				currentANSI = ""
+				// currentANSI = ""
 			} else {
 				// Not escape, so what is it?
 				if unicode.IsPrint(char) {
@@ -335,7 +335,7 @@ func NoMoreSecrets(output string, Door *Door, config *NoMoreSecretsConfig) {
 					work = append(work, []byte(currentANSI)...)
 					workpos += len(currentANSI)
 				}
-				currentANSI = ""
+				// currentANSI = ""
 			} else {
 				// Not escape, so what is it?
 				if unicode.IsPrint(rune(char)) {

door/screen.go

@@ -10,7 +10,7 @@ func (s *Screen) AddPanel(panel Panel) {
 
 func (s *Screen) Output() string {
 	var result string
-	for idx, _ := range s.Panels {
+	for idx := range s.Panels {
 		result += s.Panels[idx].Output()
 	}
 	return result
@@ -18,7 +18,7 @@ func (s *Screen) Output() string {
 
 func (s *Screen) Update() string {
 	var result string
-	for idx, _ := range s.Panels {
+	for idx := range s.Panels {
 		result += s.Panels[idx].Update()
 	}
 	return result

door/tdfont.go

@@ -470,9 +470,12 @@ func (cf *ColorFont) Scan(find_color int) ColorMap {
 			if found {
 				var pos [2]int = [2]int{charIndex, lineIndex}
 				Targets[pos] = make([][2]int, len(patches))
-				for i := range patches {
-					Targets[pos][i] = patches[i]
-				}
+				copy(Targets[pos], patches)
+				/*
+					for i := range patches {
+						Targets[pos][i] = patches[i]
+					}
+				*/
 				// Targets[pos] = patches
 			}
 		}

door/wopr.go

@@ -143,7 +143,7 @@ func (w *WOPR) Animate(d *Door) {
 	go func(d *Door) {
 		var output string
 
-		for _ = range w.Ticker.C {
+		for range w.Ticker.C {
 			w.ElapsedPanel.Update()
 			w.RemainingPanel.Update()
 			output = SavePos + w.ElapsedPanel.Output() + w.RemainingPanel.Output() + RestorePos

door/write.go

@@ -149,5 +149,4 @@ func (d *Door) Write(output string) {
 
 	// Is it possible that the channel would get closed here?
 	d.writerChannel <- output
-	return
 }