From 06aaeed9f20d3eddc30273ea8365db82331db262 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Mon, 13 Mar 2023 23:17:26 -0600
Subject: btrfsutil: OldRebuiltForrest: Fuss with indentation in rawTreeWalk

---
 lib/btrfsutil/old_rebuilt_forrest.go | 61 ++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 31 deletions(-)

(limited to 'lib')

diff --git a/lib/btrfsutil/old_rebuilt_forrest.go b/lib/btrfsutil/old_rebuilt_forrest.go
index 08a204f..af2643a 100644
--- a/lib/btrfsutil/old_rebuilt_forrest.go
+++ b/lib/btrfsutil/old_rebuilt_forrest.go
@@ -153,40 +153,39 @@ func (bt *OldRebuiltForrest) RebuiltTree(treeID btrfsprim.ObjID) oldRebuiltTree
 }
 
 func (bt *OldRebuiltForrest) rawTreeWalk(root btrfstree.TreeRoot, cacheEntry oldRebuiltTree, walked *[]btrfsprim.Key) {
-	btrfstree.TreeOperatorImpl{NodeSource: bt.inner}.RawTreeWalk(
-		bt.ctx,
-		root,
-		func(err *btrfstree.TreeError) {
-			if len(err.Path) > 0 && err.Path.Node(-1).ToNodeAddr == 0 {
-				// This is a panic because on the filesystems I'm working with it more likely
-				// indicates a bug in my item parser than a problem with the filesystem.
-				panic(fmt.Errorf("TODO: error parsing item: %w", err))
+	errHandle := func(err *btrfstree.TreeError) {
+		if len(err.Path) > 0 && err.Path.Node(-1).ToNodeAddr == 0 {
+			// This is a panic because on the filesystems I'm working with it more likely
+			// indicates a bug in my item parser than a problem with the filesystem.
+			panic(fmt.Errorf("TODO: error parsing item: %w", err))
+		}
+		cacheEntry.Errors.Insert(oldRebuiltTreeError{
+			Path: bt.arena.Deflate(err.Path),
+			Err:  err.Err,
+		})
+	}
+
+	cbs := btrfstree.TreeWalkHandler{
+		Item: func(path btrfstree.TreePath, item btrfstree.Item) error {
+			if cacheEntry.Items.Search(func(v oldRebuiltTreeValue) int { return item.Key.Compare(v.Key) }) != nil {
+				// This is a panic because I'm not really sure what the best way to
+				// handle this is, and so if this happens I want the program to crash
+				// and force me to figure out how to handle it.
+				panic(fmt.Errorf("dup key=%v in tree=%v", item.Key, root.TreeID))
 			}
-			cacheEntry.Errors.Insert(oldRebuiltTreeError{
-				Path: bt.arena.Deflate(err.Path),
-				Err:  err.Err,
+			cacheEntry.Items.Insert(oldRebuiltTreeValue{
+				Path:     bt.arena.Deflate(path),
+				Key:      item.Key,
+				ItemSize: item.BodySize,
 			})
+			if walked != nil {
+				*walked = append(*walked, item.Key)
+			}
+			return nil
 		},
-		btrfstree.TreeWalkHandler{
-			Item: func(path btrfstree.TreePath, item btrfstree.Item) error {
-				if cacheEntry.Items.Search(func(v oldRebuiltTreeValue) int { return item.Key.Compare(v.Key) }) != nil {
-					// This is a panic because I'm not really sure what the best way to
-					// handle this is, and so if this happens I want the program to crash
-					// and force me to figure out how to handle it.
-					panic(fmt.Errorf("dup key=%v in tree=%v", item.Key, root.TreeID))
-				}
-				cacheEntry.Items.Insert(oldRebuiltTreeValue{
-					Path:     bt.arena.Deflate(path),
-					Key:      item.Key,
-					ItemSize: item.BodySize,
-				})
-				if walked != nil {
-					*walked = append(*walked, item.Key)
-				}
-				return nil
-			},
-		},
-	)
+	}
+
+	btrfstree.TreeOperatorImpl{NodeSource: bt.inner}.RawTreeWalk(bt.ctx, root, errHandle, cbs)
 }
 
 func (bt *OldRebuiltForrest) TreeLookup(treeID btrfsprim.ObjID, key btrfsprim.Key) (btrfstree.Item, error) {
-- 
cgit v1.2.3-54-g00ecf