From ccdb696c2dc4b69b3253a6caae6e51d78d8213d2 Mon Sep 17 00:00:00 2001 From: Zorchenhimer Date: Sun, 7 Dec 2025 20:52:57 -0500 Subject: [PATCH] Move the .fds check to ReadRomFile() The filename is already beeing passed into ReadRomFile(), so just check it in there instead of requiring IsFds to be passed separately. --- cmd/fdslist.go | 2 +- reader.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/fdslist.go b/cmd/fdslist.go index b68849f..7e25e1d 100644 --- a/cmd/fdslist.go +++ b/cmd/fdslist.go @@ -32,7 +32,7 @@ func main() { } func run(args *Arguments) error { - rom, err := fds.ReadRomFile(args.Input, filepath.Ext(args.Input) == ".fds") + rom, err := fds.ReadRomFile(args.Input) if err != nil { return err } diff --git a/reader.go b/reader.go index 4d1b2d9..a03186a 100644 --- a/reader.go +++ b/reader.go @@ -7,18 +7,19 @@ import ( "bufio" "bytes" "encoding/binary" + "path/filepath" "github.com/sigurn/crc16" ) -func ReadRomFile(filename string, IsFds bool) (*Rom, error) { +func ReadRomFile(filename string) (*Rom, error) { file, err := os.Open(filename) if err != nil { return nil, err } defer file.Close() - blocks, err := ReadRomBlocks(file, IsFds) + blocks, err := ReadRomBlocks(file, filepath.Ext(filename) == ".fds") if err != nil { return nil, err }