From 7349ff1a01b29eae7f7e769fe44548f09c253d2b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 2 Mar 2023 17:25:49 -0700 Subject: tree-wide: Have "interior" rather than "internal" be the antonym of "leaf" Because "internal" has a meaning in the Go world, and it's confusing. --- cmd/btrfs-rec/inspect/dumptrees/print_tree.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd/btrfs-rec/inspect') diff --git a/cmd/btrfs-rec/inspect/dumptrees/print_tree.go b/cmd/btrfs-rec/inspect/dumptrees/print_tree.go index 676306a..b7e7552 100644 --- a/cmd/btrfs-rec/inspect/dumptrees/print_tree.go +++ b/cmd/btrfs-rec/inspect/dumptrees/print_tree.go @@ -375,7 +375,7 @@ func printTree(ctx context.Context, out io.Writer, fs *btrfs.FS, treeID btrfspri // printHeaderInfo mimics btrfs-progs kernel-shared/print-tree.c:print_header_info() func printHeaderInfo(out io.Writer, node btrfstree.Node) { var typename string - if node.Head.Level > 0 { // internal node + if node.Head.Level > 0 { // interior node typename = "node" textui.Fprintf(out, "node %v level %v items %v free space %v", node.Head.Addr, -- cgit v1.2.3-2-g168b From 2c2d616b8650dd01818bd29e11e7b06ae2de5891 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 4 Mar 2023 09:51:34 -0700 Subject: tree-wide: Refer to item "slots" rather than "indexes" --- cmd/btrfs-rec/inspect/dumptrees/print_tree.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd/btrfs-rec/inspect') diff --git a/cmd/btrfs-rec/inspect/dumptrees/print_tree.go b/cmd/btrfs-rec/inspect/dumptrees/print_tree.go index b7e7552..a0a3d46 100644 --- a/cmd/btrfs-rec/inspect/dumptrees/print_tree.go +++ b/cmd/btrfs-rec/inspect/dumptrees/print_tree.go @@ -113,7 +113,7 @@ func printTree(ctx context.Context, out io.Writer, fs *btrfs.FS, treeID btrfspri }, Item: func(path btrfstree.TreePath, item btrfstree.Item) error { treeID := path[0].FromTree - i := path.Node(-1).FromItemIdx + i := path.Node(-1).FromItemSlot bs, _ := binstruct.Marshal(item.Body) itemSize := uint32(len(bs)) itemOffset -= itemSize -- cgit v1.2.3-2-g168b