Fixed more linter warnings

consolein/consolein_test.go

@@ -1,8 +1,6 @@
 package consolein
 
-import (
-	"testing"
-)
+import "testing"
 
 func TestReadline(t *testing.T) {
 

consolein/select_unix.go

@@ -12,7 +12,7 @@ import (
 // SELECT to read from STDIN.
 func canSelect() bool {
 
-	fds := &unix.FdSet{}
+	fds := new(unix.FdSet)
 	fds.Set(int(os.Stdin.Fd()))
 
 	// See if input is pending, for a while.

consoleout/consoleout_test.go

@@ -73,7 +73,7 @@ func TestOutput(t *testing.T) {
 		}
 
 		// ensure we redirect the output
-		tmp := &bytes.Buffer{}
+		tmp := new(bytes.Buffer)
 
 		d.driver.SetWriter(tmp)
 
@@ -106,7 +106,7 @@ func TestNull(t *testing.T) {
 	}
 
 	// ensure we redirect the output
-	tmp := &bytes.Buffer{}
+	tmp := new(bytes.Buffer)
 
 	null.driver.SetWriter(tmp)
 
@@ -134,7 +134,7 @@ func TestLogger(t *testing.T) {
 	}
 
 	// ensure we redirect the output
-	tmp := &bytes.Buffer{}
+	tmp := new(bytes.Buffer)
 
 	drv.driver.SetWriter(tmp)
 

cpm/cpm_bdos_test.go

@@ -363,7 +363,7 @@ func TestDriveGetSet(t *testing.T) {
 	}
 
 	// Set a drive to a bogus value
-	c.CPU.States.AF.Hi = 0xff
+	c.CPU.States.AF.Hi = 0xFF
 	err = BdosSysCallDriveSet(c)
 	if err != nil {
 		t.Fatalf("failed to call CP/M")
@@ -428,7 +428,7 @@ func TestUserNumber(t *testing.T) {
 	}
 
 	// now get properly
-	c.CPU.States.DE.Lo = 0xff
+	c.CPU.States.DE.Lo = 0xFF
 	err = BdosSysCallUserNumber(c)
 	if err != nil {
 		t.Fatalf("failed to call CPM")
@@ -475,8 +475,8 @@ func TestDriveReset(t *testing.T) {
 
 	// Now reset again and we should see 0xFF to trigger
 	// the submit.com behaviour
-	if getState() != 0xff {
-		t.Fatalf("getState != 0xff")
+	if getState() != 0xFF {
+		t.Fatalf("getState != 0xFF")
 	}
 }
 
@@ -565,7 +565,7 @@ func TestIOByte(t *testing.T) {
 	}
 
 	// set it
-	c.CPU.States.DE.Lo = 0xfe
+	c.CPU.States.DE.Lo = 0xFE
 	err = BdosSysCallSetIOByte(c)
 	if err != nil {
 		t.Fatalf("error in CPM call")
@@ -577,7 +577,7 @@ func TestIOByte(t *testing.T) {
 		t.Fatalf("error in CPM call")
 	}
 
-	if c.CPU.States.AF.Hi != 0xfe {
+	if c.CPU.States.AF.Hi != 0xFE {
 		t.Fatalf("unexpected updated IO byte")
 	}
 }
@@ -597,7 +597,7 @@ func TestBDOSCoverage(t *testing.T) {
 	for _, handler := range c.BDOSSyscalls {
 
 		if handler.Fake {
-			err := handler.Handler(c)
+			err = handler.Handler(c)
 			if err != nil {
 				t.Fatalf("error calling %s\n", handler.Desc)
 			}
@@ -663,7 +663,7 @@ func TestMakeFile(t *testing.T) {
 	c.SetDrives(false)
 
 	fileExists := func(path string) bool {
-		if _, err := os.Stat(path); errors.Is(err, os.ErrNotExist) {
+		if _, err2 := os.Stat(path); errors.Is(err2, os.ErrNotExist) {
 			return false
 		}
 		return true
@@ -703,7 +703,7 @@ func TestMakeFile(t *testing.T) {
 
 	// Why not also try to close a file that is
 	// not open?
-	c.CPU.States.DE.SetU16(0xcdcd)
+	c.CPU.States.DE.SetU16(0xCDCD)
 	err = BdosSysCallFileClose(c)
 	if err != nil {
 		t.Fatalf("failed to close file which wasn't open")
@@ -716,7 +716,7 @@ func TestMakeFile(t *testing.T) {
 	if err != nil {
 		t.Fatalf("error calling CP/M")
 	}
-	if c.CPU.States.AF.Hi != 0xff {
+	if c.CPU.States.AF.Hi != 0xFF {
 		t.Fatalf("expected error with empty file")
 	}
 
@@ -745,7 +745,7 @@ func TestDelete(t *testing.T) {
 	}
 
 	fileExists := func(path string) bool {
-		if _, err := os.Stat(path); errors.Is(err, os.ErrNotExist) {
+		if _, err2 := os.Stat(path); errors.Is(err2, os.ErrNotExist) {
 			return false
 		}
 		return true
@@ -795,7 +795,7 @@ func TestRename(t *testing.T) {
 	}
 
 	fileExists := func(path string) bool {
-		if _, err := os.Stat(path); errors.Is(err, os.ErrNotExist) {
+		if _, err2 := os.Stat(path); errors.Is(err2, os.ErrNotExist) {
 			return false
 		}
 		return true
@@ -843,7 +843,7 @@ func TestRename(t *testing.T) {
 	if err != nil {
 		t.Fatalf("error calling CP/M")
 	}
-	if c.CPU.States.AF.Hi != 0xff {
+	if c.CPU.States.AF.Hi != 0xFF {
 		t.Fatalf("renaming to an impossible name succeeded")
 	}
 
@@ -863,7 +863,7 @@ func TestWriteFile(t *testing.T) {
 	c.SetDrives(false)
 
 	fileExists := func(path string) bool {
-		if _, err := os.Stat(path); errors.Is(err, os.ErrNotExist) {
+		if _, err2 := os.Stat(path); errors.Is(err2, os.ErrNotExist) {
 			return false
 		}
 		return true
@@ -965,7 +965,7 @@ func TestWriteFile(t *testing.T) {
 	if err != nil {
 		t.Fatalf("error calling cp/m")
 	}
-	if c.CPU.States.AF.Hi != 0xff {
+	if c.CPU.States.AF.Hi != 0xFF {
 		t.Fatalf("expected A-reg to hold an error")
 	}
 }
@@ -994,7 +994,7 @@ func TestReadFile(t *testing.T) {
 	if err != nil {
 		t.Fatalf("error calling cp/m")
 	}
-	if c.CPU.States.AF.Hi != 0xff {
+	if c.CPU.States.AF.Hi != 0xFF {
 		t.Fatalf("expected A-reg to hold an error")
 	}
 

cpm/cpm_bios_test.go

@@ -37,7 +37,7 @@ func TestStatus(t *testing.T) {
 		t.Fatalf("failed to call CPM")
 	}
 
-	if c.CPU.States.AF.Hi != 0xff {
+	if c.CPU.States.AF.Hi != 0xFF {
 		t.Fatalf("printer status was wrong")
 	}
 
@@ -46,7 +46,7 @@ func TestStatus(t *testing.T) {
 		t.Fatalf("failed to call CPM")
 	}
 
-	if c.CPU.States.AF.Hi != 0xff {
+	if c.CPU.States.AF.Hi != 0xFF {
 		t.Fatalf("screen status was wrong")
 	}
 
@@ -55,7 +55,7 @@ func TestStatus(t *testing.T) {
 		t.Fatalf("failed to call CPM")
 	}
 
-	if c.CPU.States.AF.Hi != 0xff {
+	if c.CPU.States.AF.Hi != 0xFF {
 		t.Fatalf("aux input status was wrong")
 	}
 
@@ -64,7 +64,7 @@ func TestStatus(t *testing.T) {
 		t.Fatalf("failed to call CPM")
 	}
 
-	if c.CPU.States.AF.Hi != 0xff {
+	if c.CPU.States.AF.Hi != 0xFF {
 		t.Fatalf("aux output status was wrong")
 	}
 
@@ -157,17 +157,17 @@ func TestCustom(t *testing.T) {
 
 	// set to "null"
 	c.CPU.States.HL.SetU16(0x0002)
-	c.CPU.States.DE.SetU16(0xfe00)
-	c.Memory.SetRange(0xfe00, []byte{'n', 'u', 'l', 'l', ' '}...)
+	c.CPU.States.DE.SetU16(0xFE00)
+	c.Memory.SetRange(0xFE00, []byte{'n', 'u', 'l', 'l', ' '}...)
 	err = BiosSysCallReserved1(c)
 	if err != nil {
 		t.Fatalf("error calling reserved function")
 	}
 
 	// set to "steve" - this will fail
 	c.CPU.States.HL.SetU16(0x0002)
-	c.CPU.States.DE.SetU16(0xfe00)
-	c.Memory.SetRange(0xfe00, []byte{'s', 't', 'e', 'v', 'e', ' '}...)
+	c.CPU.States.DE.SetU16(0xFE00)
+	c.Memory.SetRange(0xFE00, []byte{'s', 't', 'e', 'v', 'e', ' '}...)
 	err = BiosSysCallReserved1(c)
 	if err != nil {
 		t.Fatalf("error calling reserved function")
@@ -200,17 +200,17 @@ func TestCustom(t *testing.T) {
 
 	// set to "ccpz"
 	c.CPU.States.HL.SetU16(0x0003)
-	c.CPU.States.DE.SetU16(0xfe00)
-	c.Memory.SetRange(0xfe00, []byte{'c', 'c', 'p', 'z', ' '}...)
+	c.CPU.States.DE.SetU16(0xFE00)
+	c.Memory.SetRange(0xFE00, []byte{'c', 'c', 'p', 'z', ' '}...)
 	err = BiosSysCallReserved1(c)
 	if err != nil {
 		t.Fatalf("error calling reserved function")
 	}
 
 	// set to "steve" - this will fail
 	c.CPU.States.HL.SetU16(0x0003)
-	c.CPU.States.DE.SetU16(0xfe00)
-	c.Memory.SetRange(0xfe00, []byte{'s', 't', 'e', 'v', 'e', ' '}...)
+	c.CPU.States.DE.SetU16(0xFE00)
+	c.Memory.SetRange(0xFE00, []byte{'s', 't', 'e', 'v', 'e', ' '}...)
 	err = BiosSysCallReserved1(c)
 	if err != nil {
 		t.Fatalf("error calling reserved function")

cpm/cpm_test.go

@@ -37,11 +37,11 @@ func TestSimple(t *testing.T) {
 	}
 
 	// Write a string of three bytes to the console - again discarded
-	obj.CPU.States.DE.SetU16(0xfe00)
-	obj.Memory.Set(0xfe00, 's')
-	obj.Memory.Set(0xfe01, 'k')
-	obj.Memory.Set(0xfe02, 'x')
-	obj.Memory.Set(0xfe03, '$')
+	obj.CPU.States.DE.SetU16(0xFE00)
+	obj.Memory.Set(0xFE00, 's')
+	obj.Memory.Set(0xFE01, 'k')
+	obj.Memory.Set(0xFE02, 'x')
+	obj.Memory.Set(0xFE03, '$')
 	err = BdosSysCallWriteString(obj)
 	if err != nil {
 		t.Fatalf("failed to call CPM")
@@ -282,7 +282,7 @@ func TestCPMCoverage(t *testing.T) {
 	}
 
 	// Invalid
-	obj.Out(0xFF, 0xff)
+	obj.Out(0xFF, 0xFF)
 	if obj.biosErr != ErrUnimplemented {
 		t.Fatalf("expected unimplemented, got %s", obj.biosErr)
 	}
@@ -337,7 +337,6 @@ func TestAutoExec(t *testing.T) {
 	obj.StuffText("nothing\n")
 	obj.RunAutoExec()
 
-	out = ""
 	out, err = obj.input.ReadLine(200)
 	if err != nil {
 		t.Fatalf("failed to call ReadLine")

main.go

@@ -174,11 +174,9 @@ func main() {
 	slog.SetDefault(log)
 
 	// Create a new emulator.
-	obj, err := cpm.New(
-		cpm.WithPrinterPath(*prnPath),
+	obj, err := cpm.New(cpm.WithPrinterPath(*prnPath),
 		cpm.WithConsoleDriver(*console),
-		cpm.WithCCP(*ccp),
-	)
+		cpm.WithCCP(*ccp))
 	if err != nil {
 		fmt.Printf("error creating CPM object: %s\n", err)
 		return

memory/memory.go

@@ -2,9 +2,7 @@
 // within which the emulator executes its programs.
 package memory
 
-import (
-	"os"
-)
+import "os"
 
 // Memory is our structure for representing the 64k of RAM
 // that we run our programs within.