simplified calls to logger package

calls to Logf() which do no formatting replaced with Log()

calls to Log() with Sprintf() replaced with Logf()

error types sent without use of Error(), taken advantage of new logger
package features

correct construction of wrapped errors in eeprom package

bots/chess/uci/uci.go

@@ -90,7 +90,7 @@ func NewUCI(pathToEngine string, diagnostic chan bots.Diagnostic) (*UCI, error)
 
 		err = cmd.Wait()
 		if err != nil {
-			logger.Logf(logger.Allow, "uci", err.Error())
+			logger.Log(logger.Allow, "uci", err)
 			return
 		}
 	}()
@@ -170,7 +170,7 @@ func (uci *UCI) Start() error {
 
 				_, err = uci.stdin.Write([]byte("go depth 10\n"))
 				if err != nil {
-					logger.Logf(logger.Allow, "uci", err.Error())
+					logger.Log(logger.Allow, "uci", err)
 					return
 				}
 
@@ -180,7 +180,7 @@ func (uci *UCI) Start() error {
 
 					n, err = uci.stdout.Read(buf)
 					if err != nil {
-						logger.Logf(logger.Allow, "uci", err.Error())
+						logger.Log(logger.Allow, "uci", err)
 						return
 					}
 

coprocessor/developer/dwarf/dwarf_builder.go

@@ -1085,7 +1085,7 @@ func (bld *build) buildFunctions(src *Source, addressAdjustment uint64) error {
 
 				fn, err := resolve(av)
 				if err != nil {
-					logger.Logf(logger.Allow, "dwarf", err.Error())
+					logger.Log(logger.Allow, "dwarf", err)
 					continue // build order loop
 				}
 
@@ -1115,7 +1115,7 @@ func (bld *build) buildFunctions(src *Source, addressAdjustment uint64) error {
 			} else {
 				fn, err := resolve(e)
 				if err != nil {
-					logger.Logf(logger.Allow, "dwarf", err.Error())
+					logger.Log(logger.Allow, "dwarf", err)
 					continue // build order loop
 				}
 
@@ -1196,7 +1196,7 @@ func (bld *build) buildFunctions(src *Source, addressAdjustment uint64) error {
 
 				err := commitInlinedSubroutine(low, high)
 				if err != nil {
-					logger.Logf(logger.Allow, "dwarf", err.Error())
+					logger.Log(logger.Allow, "dwarf", err)
 					continue // build order loop
 				}
 
@@ -1209,7 +1209,7 @@ func (bld *build) buildFunctions(src *Source, addressAdjustment uint64) error {
 				commitRange := func(low uint64, high uint64) {
 					err := commitInlinedSubroutine(low, high)
 					if err != nil {
-						logger.Logf(logger.Allow, "dwarf", err.Error())
+						logger.Log(logger.Allow, "dwarf", err)
 					}
 				}
 

coprocessor/developer/dwarf/source.go

@@ -289,13 +289,13 @@ func NewSource(romFile string, cart Cartridge, elfFile string) (*Source, error)
 		data, _, _ := c.ELFSection(".debug_frame")
 		src.debugFrame, err = newFrameSection(data, ef.ByteOrder, src.cart.GetCoProcBus().GetCoProc(), nil)
 		if err != nil {
-			logger.Logf(logger.Allow, "dwarf", err.Error())
+			logger.Log(logger.Allow, "dwarf", err)
 		}
 
 		data, _, _ = c.ELFSection(".debug_loc")
 		src.debugLoc, err = newLoclistSection(data, ef.ByteOrder, src.cart.GetCoProcBus().GetCoProc())
 		if err != nil {
-			logger.Logf(logger.Allow, "dwarf", err.Error())
+			logger.Log(logger.Allow, "dwarf", err)
 		}
 	} else {
 		var adjust bool
@@ -317,13 +317,13 @@ func NewSource(romFile string, cart Cartridge, elfFile string) (*Source, error)
 		}
 		src.debugFrame, err = newFrameSectionFromFile(ef, src.cart.GetCoProcBus().GetCoProc(), &rel)
 		if err != nil {
-			logger.Logf(logger.Allow, "dwarf", err.Error())
+			logger.Log(logger.Allow, "dwarf", err)
 		}
 
 		// create loclist section from the raw ELF section
 		src.debugLoc, err = newLoclistSectionFromFile(ef, src.cart.GetCoProcBus().GetCoProc())
 		if err != nil {
-			logger.Logf(logger.Allow, "dwarf", err.Error())
+			logger.Log(logger.Allow, "dwarf", err)
 		}
 
 		if adjust {
@@ -343,7 +343,7 @@ func NewSource(romFile string, cart Cartridge, elfFile string) (*Source, error)
 	// log address adjustment value. how the value was arrived at is slightly
 	// different depending on whether the ELF file relocatable or not
 	if addressAdjustment == 0 {
-		logger.Logf(logger.Allow, "dwarf", "address adjustment not required")
+		logger.Log(logger.Allow, "dwarf", "address adjustment not required")
 	} else {
 		logger.Logf(logger.Allow, "dwarf", "using address adjustment: %#x", int(addressAdjustment))
 	}
@@ -437,7 +437,7 @@ func NewSource(romFile string, cart Cartridge, elfFile string) (*Source, error)
 				if _, ok := src.Files[f.Name]; !ok {
 					sf, err := readSourceFile(f.Name, src.path, &src.AllLines)
 					if err != nil {
-						logger.Logf(logger.Allow, "dwarf", "%v", err)
+						logger.Log(logger.Allow, "dwarf", err)
 					} else {
 						src.Files[sf.Filename] = sf
 						src.Filenames = append(src.Filenames, sf.Filename)

debugger/debugger.go

@@ -370,7 +370,7 @@ func NewDebugger(opts CommandLineOptions, create CreateUserInterface) (*Debugger
 	// stella.pro support
 	dbg.Properties, err = properties.Load()
 	if err != nil {
-		logger.Logf(logger.Allow, "debugger", err.Error())
+		logger.Log(logger.Allow, "debugger", err)
 	}
 
 	// create preview emulation
@@ -570,7 +570,7 @@ func (dbg *Debugger) setState(state govern.State, subState govern.SubState) {
 
 	err := dbg.vcs.TV.SetEmulationState(state)
 	if err != nil {
-		logger.Log(logger.Allow, "debugger", err.Error())
+		logger.Log(logger.Allow, "debugger", err)
 	}
 	if dbg.ref != nil {
 		dbg.ref.SetEmulationState(state)
@@ -690,13 +690,13 @@ func (dbg *Debugger) end() {
 	// set ending state
 	err := dbg.gui.SetFeature(gui.ReqEnd)
 	if err != nil {
-		logger.Log(logger.Allow, "debugger", err.Error())
+		logger.Log(logger.Allow, "debugger", err)
 	}
 
 	// save preferences
 	err = dbg.Prefs.Save()
 	if err != nil {
-		logger.Log(logger.Allow, "debugger", err.Error())
+		logger.Log(logger.Allow, "debugger", err)
 	}
 }
 
@@ -951,7 +951,7 @@ func (dbg *Debugger) run() error {
 	defer func() {
 		err := dbg.scriptScribe.EndSession()
 		if err != nil {
-			logger.Logf(logger.Allow, "debugger", err.Error())
+			logger.Log(logger.Allow, "debugger", err)
 		}
 	}()
 
@@ -960,7 +960,7 @@ func (dbg *Debugger) run() error {
 		if dbg.cartload != nil {
 			err := dbg.cartload.Close()
 			if err != nil {
-				logger.Logf(logger.Allow, "debugger", err.Error())
+				logger.Log(logger.Allow, "debugger", err)
 			}
 		}
 	}()
@@ -982,7 +982,7 @@ func (dbg *Debugger) run() error {
 				} else if errors.Is(err, terminal.UserReload) {
 					err = dbg.reloadCartridge()
 					if err != nil {
-						logger.Logf(logger.Allow, "debugger", err.Error())
+						logger.Log(logger.Allow, "debugger", err)
 					}
 				} else {
 					return fmt.Errorf("debugger: %w", err)
@@ -1197,15 +1197,15 @@ func (dbg *Debugger) attachCartridge(cartload cartridgeloader.Loader) (e error)
 	if dbg.cartload != nil {
 		err := dbg.cartload.Close()
 		if err != nil {
-			logger.Logf(logger.Allow, "debuger", err.Error())
+			logger.Log(logger.Allow, "debuger", err)
 		}
 	}
 	dbg.cartload = &cartload
 
 	// reset of vcs is implied with attach cartridge
 	err := setup.AttachCartridge(dbg.vcs, cartload, false)
 	if err != nil && !errors.Is(err, cartridge.Ejected) {
-		logger.Logf(logger.Allow, "debugger", err.Error())
+		logger.Log(logger.Allow, "debugger", err)
 		// an error has occurred so attach the ejected cartridge
 		//
 		// !TODO: a special error cartridge to make it more obvious what has happened
@@ -1230,17 +1230,17 @@ func (dbg *Debugger) attachCartridge(cartload cartridgeloader.Loader) (e error)
 
 	err = dbg.Disasm.FromMemory()
 	if err != nil {
-		logger.Logf(logger.Allow, "debugger", err.Error())
+		logger.Log(logger.Allow, "debugger", err)
 	}
 
 	dbg.CoProcDisasm.AttachCartridge(dbg.vcs.Mem.Cart)
 	err = dbg.CoProcDev.AttachCartridge(dbg.vcs.Mem.Cart, cartload.Filename, dbg.opts.ELF)
 	if err != nil {
-		logger.Logf(logger.Allow, "debugger", err.Error())
+		logger.Log(logger.Allow, "debugger", err)
 		if errors.Is(err, coproc_dwarf.UnsupportedDWARF) {
 			err = dbg.gui.SetFeature(gui.ReqNotification, notifications.NotifyUnsupportedDWARF)
 			if err != nil {
-				logger.Logf(logger.Allow, "debugger", err.Error())
+				logger.Log(logger.Allow, "debugger", err)
 			}
 		}
 	}
@@ -1270,7 +1270,7 @@ func (dbg *Debugger) attachCartridge(cartload cartridgeloader.Loader) (e error)
 	// activate bot if possible
 	feedback, err := dbg.bots.ActivateBot(dbg.vcs.Mem.Cart.Hash)
 	if err != nil {
-		logger.Logf(logger.Allow, "debugger", err.Error())
+		logger.Log(logger.Allow, "debugger", err)
 	}
 
 	// always ReqBotFeedback. if feedback is nil then the bot features will be disbaled
@@ -1315,7 +1315,7 @@ func (dbg *Debugger) endRecording() {
 
 	err := dbg.recorder.End()
 	if err != nil {
-		logger.Logf(logger.Allow, "debugger", err.Error())
+		logger.Log(logger.Allow, "debugger", err)
 	}
 	dbg.vcs.TV.SetSimple(false)
 }
@@ -1412,7 +1412,7 @@ func (dbg *Debugger) endComparison() {
 	dbg.comparison = nil
 	err := dbg.gui.SetFeature(gui.ReqComparison, nil, nil, nil)
 	if err != nil {
-		logger.Logf(logger.Allow, "debugger", err.Error())
+		logger.Log(logger.Allow, "debugger", err)
 	}
 }
 
@@ -1460,7 +1460,7 @@ func (dbg *Debugger) Plugged(port plugging.PortID, peripheral plugging.Periphera
 	}
 	err := dbg.gui.SetFeature(gui.ReqPeripheralPlugged, port, peripheral)
 	if err != nil {
-		logger.Log(logger.Allow, "debugger", err.Error())
+		logger.Log(logger.Allow, "debugger", err)
 	}
 }
 

debugger/deeppoke.go

@@ -38,7 +38,7 @@ func (dbg *Debugger) PushDeepPoke(addr uint16, value uint8, newValue uint8, valu
 	doDeepPoke := func() error {
 		err := dbg.doDeepPoke(searchState, addr, value, newValue, valueMask)
 		if err != nil {
-			logger.Logf(logger.Allow, "deeppoke", "%v", err)
+			logger.Log(logger.Allow, "deeppoke", err)
 		}
 		if done != nil {
 			done()
@@ -294,6 +294,6 @@ func deepPoke(mem *memory.Memory, poke deepPoking, value uint8, valueMask uint8)
 		return err
 	}
 	v = (v & (valueMask ^ 0xff)) | (value & valueMask)
-	logger.Log(logger.Allow, "deeppoke", fmt.Sprintf("changing %#04x (%s) to %#02x", poke.addr, poke.area, value))
+	logger.Logf(logger.Allow, "deeppoke", "changing %#04x (%s) to %#02x", poke.addr, poke.area, value)
 	return mem.Poke(poke.addr, v)
 }

debugger/loop_debugger.go

@@ -585,7 +585,7 @@ func (dbg *Debugger) handleInterrupt(inputter terminal.Input) {
 	// end script scribe (if one is running)
 	err := dbg.scriptScribe.EndSession()
 	if err != nil {
-		logger.Logf(logger.Allow, "debugger", err.Error())
+		logger.Log(logger.Allow, "debugger", err)
 	}
 
 	// exit immediately if inputter is not a real terminal

debugger/push.go

@@ -60,7 +60,7 @@ func (dbg *Debugger) PushSetPause(paused bool) {
 			}
 		})
 	case govern.ModeDebugger:
-		logger.Logf(logger.Allow, "debugger", "not reacting to SetPause() in debugger mode (use terminal input instead)")
+		logger.Log(logger.Allow, "debugger", "not reacting to SetPause() in debugger mode (use terminal input instead)")
 	}
 }
 
@@ -79,7 +79,7 @@ func (dbg *Debugger) PushMemoryProfile() {
 	dbg.PushFunctionImmediate(func() {
 		fn, err := dbg.memoryProfile()
 		if err != nil {
-			logger.Logf(logger.Allow, "memory profiling", err.Error())
+			logger.Log(logger.Allow, "memory profiling", err)
 			return
 		}
 		logger.Logf(logger.Allow, "memory profiling", "saved to %s", fn)

disassembly/symbols/symbols.go

@@ -296,7 +296,7 @@ func (sym *Symbols) AfterLabelChange() {
 
 	sym.labelCommands, err = commandline.ParseCommandTemplate(s)
 	if err != nil {
-		logger.Logf(logger.Allow, "symbols", "creating commandline.Extension: %s", err.Error())
+		logger.Logf(logger.Allow, "symbols", "creating commandline.Extension: %v", err)
 	}
 }
 
@@ -320,7 +320,7 @@ func (sym *Symbols) AfterSymbolChange() {
 
 	sym.readCommands, err = commandline.ParseCommandTemplate(read)
 	if err != nil {
-		logger.Logf(logger.Allow, "symbols", "creating commandline.Extension: %s", err.Error())
+		logger.Logf(logger.Allow, "symbols", "creating commandline.Extension: %v", err)
 	}
 
 	// write symbols
@@ -333,7 +333,7 @@ func (sym *Symbols) AfterSymbolChange() {
 
 	sym.readCommands, err = commandline.ParseCommandTemplate(write)
 	if err != nil {
-		logger.Logf(logger.Allow, "symbols", "creating commandline.Extension: %s", err.Error())
+		logger.Logf(logger.Allow, "symbols", "creating commandline.Extension: %v", err)
 	}
 
 	// all symbols
@@ -344,7 +344,7 @@ func (sym *Symbols) AfterSymbolChange() {
 
 	sym.readwriteCommands, err = commandline.ParseCommandTemplate(all)
 	if err != nil {
-		logger.Logf(logger.Allow, "symbols", "creating commandline.Extension: %s", err.Error())
+		logger.Logf(logger.Allow, "symbols", "creating commandline.Extension: %v", err)
 	}
 }
 

gopher2600.go

@@ -213,7 +213,7 @@ func main() {
 // indicate gui creation and to quit.
 func launch(sync *mainSync, args []string) {
 
-	logger.Log(logger.Allow, "runtime", fmt.Sprintf("number of cores being used: %d", runtime.NumCPU()))
+	logger.Logf(logger.Allow, "runtime", "number of cores being used: %d", runtime.NumCPU())
 
 	// use flag set to provide the --help flag for top level command line.
 	// that's all we want it to do
@@ -410,7 +410,7 @@ func emulate(mode string, sync *mainSync, args []string) error {
 			switch strings.ToUpper(opts.TermType) {
 			default:
 				logger.Logf(logger.Allow, "terminal", "unknown terminal: %s", opts.TermType)
-				logger.Logf(logger.Allow, "terminal", "defaulting to plain")
+				logger.Log(logger.Allow, "terminal", "defaulting to plain")
 				term = &plainterm.PlainTerminal{}
 			case "PLAIN":
 				term = &plainterm.PlainTerminal{}

gui/sdlimgui/platform.go

@@ -233,7 +233,7 @@ func (plt *platform) setSwapInterval(i int) {
 
 	err := sdl.GLSetSwapInterval(i)
 	if err != nil {
-		logger.Logf(logger.Allow, "sdl", "GLSetSwapInterval(%d): %s", i, err.Error())
+		logger.Logf(logger.Allow, "sdl", "GLSetSwapInterval(%d): %v", i, err)
 	}
 }
 

gui/sdlimgui/screenshot.go

@@ -38,7 +38,7 @@ func (img *SdlImgui) screenshot(mode screenshotMode, filenameSuffix string) {
 		// wait for result and log any errors
 		res := <-finish
 		if res.err != nil {
-			logger.Log(logger.Allow, "screenshot", res.err.Error())
+			logger.Log(logger.Allow, "screenshot", res.err)
 			return
 		}
 
@@ -61,20 +61,20 @@ func (img *SdlImgui) screenshot(mode screenshotMode, filenameSuffix string) {
 func saveJPEG(rgba *image.RGBA, path string) {
 	f, err := os.Create(path)
 	if err != nil {
-		logger.Logf(logger.Allow, "screenshot", "save failed: %v", err.Error())
+		logger.Logf(logger.Allow, "screenshot", "save failed: %v", err)
 		return
 	}
 
 	err = jpeg.Encode(f, rgba, &jpeg.Options{Quality: 100})
 	if err != nil {
-		logger.Logf(logger.Allow, "screenshot", "save failed: %v", err.Error())
+		logger.Logf(logger.Allow, "screenshot", "save failed: %v", err)
 		_ = f.Close()
 		return
 	}
 
 	err = f.Close()
 	if err != nil {
-		logger.Logf(logger.Allow, "screenshot", "save failed: %v", err.Error())
+		logger.Logf(logger.Allow, "screenshot", "save failed: %v", err)
 		return
 	}