add open/close utility functions

2 files changed, 17 insertions, 18 deletions

diff --git a/cmd/btrfs-fsck/main.go b/cmd/btrfs-fsck/main.go
index e51aae9..ebbaff7 100644
--- a/cmd/btrfs-fsck/main.go
+++ b/cmd/btrfs-fsck/main.go
@@ -19,22 +19,13 @@ func Main(imgfilenames ...string) (err error) {
 		}
 	}
 
-	var imgfiles []*os.File
-	for _, imgfilename := range imgfilenames {
-		fh, err := os.OpenFile(imgfilename, os.O_RDWR, 0)
-		if err != nil {
-			return err
-		}
-		defer func() {
-			maybeSetErr(fh.Close())
-		}()
-		imgfiles = append(imgfiles, fh)
-	}
-
-	fs, sb, err := pass0(imgfiles...)
+	fs, sb, err := pass0(imgfilenames...)
 	if err != nil {
 		return err
 	}
+	defer func() {
+		maybeSetErr(fs.Close())
+	}()
 
 	foundNodes, err := pass1(fs, sb)
 	if err != nil {
diff --git a/cmd/btrfs-fsck/pass0.go b/cmd/btrfs-fsck/pass0.go
index 2a8e20a..c0c872b 100644
--- a/cmd/btrfs-fsck/pass0.go
+++ b/cmd/btrfs-fsck/pass0.go
@@ -8,19 +8,27 @@ import (
 	"lukeshu.com/btrfs-tools/pkg/util"
 )
 
-func pass0(imgfiles ...*os.File) (*btrfs.FS, *util.Ref[btrfs.PhysicalAddr, btrfs.Superblock], error) {
+func pass0(filenames ...string) (*btrfs.FS, *util.Ref[btrfs.PhysicalAddr, btrfs.Superblock], error) {
 	fmt.Printf("\nPass 0: init and superblocks...\n")
 
 	fs := new(btrfs.FS)
-	for _, imgfile := range imgfiles {
-		fmt.Printf("Pass 0: ... adding device %q...\n", imgfile.Name())
-		if err := fs.AddDevice(&btrfs.Device{File: imgfile}); err != nil {
-			fmt.Printf("Pass 0: ... add device %q: error: %v\n", imgfile.Name(), err)
+	for _, filename := range filenames {
+		fmt.Printf("Pass 0: ... adding device %q...\n", filename)
+
+		fh, err := os.OpenFile(filename, os.O_RDWR, 0)
+		if err != nil {
+			_ = fs.Close()
+			return nil, nil, fmt.Errorf("device %q: %w", filename, err)
+		}
+
+		if err := fs.AddDevice(&btrfs.Device{File: fh}); err != nil {
+			fmt.Printf("Pass 0: ... add device %q: error: %v\n", filename, err)
 		}
 	}
 
 	sb, err := fs.Superblock()
 	if err != nil {
+		_ = fs.Close()
 		return nil, nil, err
 	}