Merge branch 'lukeshu/log'

1 files changed, 13 insertions, 17 deletions

diff --git a/lib/btrfsprogs/btrfsinspect/print_addrspace.go b/lib/btrfsprogs/btrfsinspect/print_addrspace.go
index 7436d5b..a8b992e 100644
--- a/lib/btrfsprogs/btrfsinspect/print_addrspace.go
+++ b/lib/btrfsprogs/btrfsinspect/print_addrspace.go
@@ -5,14 +5,12 @@
 package btrfsinspect
 
 import (
-	"fmt"
 	"io"
 	"sort"
 
-	"golang.org/x/text/message"
-
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/textui"
 )
 
 func PrintLogicalSpace(out io.Writer, fs *btrfs.FS) {
@@ -22,28 +20,27 @@ func PrintLogicalSpace(out io.Writer, fs *btrfs.FS) {
 	for _, mapping := range mappings {
 		if mapping.LAddr > prevEnd {
 			size := mapping.LAddr.Sub(prevEnd)
-			fmt.Fprintf(out, "logical_hole laddr=%v size=%v\n", prevEnd, size)
+			textui.Fprintf(out, "logical_hole laddr=%v size=%v\n", prevEnd, size)
 			sumHole += size
 		}
 		if mapping.LAddr != prevBeg {
 			if !mapping.Flags.OK {
-				fmt.Fprintf(out, "chunk laddr=%v size=%v flags=(missing)\n",
+				textui.Fprintf(out, "chunk laddr=%v size=%v flags=(missing)\n",
 					mapping.LAddr, mapping.Size)
 			} else {
-				fmt.Fprintf(out, "chunk laddr=%v size=%v flags=%v\n",
+				textui.Fprintf(out, "chunk laddr=%v size=%v flags=%v\n",
 					mapping.LAddr, mapping.Size, mapping.Flags.Val)
 			}
 		}
-		fmt.Fprintf(out, "\tstripe dev_id=%v paddr=%v\n",
+		textui.Fprintf(out, "\tstripe dev_id=%v paddr=%v\n",
 			mapping.PAddr.Dev, mapping.PAddr.Addr)
 		sumChunk += mapping.Size
 		prevBeg = mapping.LAddr
 		prevEnd = mapping.LAddr.Add(mapping.Size)
 	}
-	p := message.NewPrinter(message.MatchLanguage("en"))
-	p.Fprintf(out, "total logical holes      = %v (%d)\n", sumHole, int64(sumHole))
-	p.Fprintf(out, "total logical chunks     = %v (%d)\n", sumChunk, int64(sumChunk))
-	p.Fprintf(out, "total logical addr space = %v (%d)\n", prevEnd, int64(prevEnd))
+	textui.Fprintf(out, "total logical holes      = %v (%d)\n", sumHole, int64(sumHole))
+	textui.Fprintf(out, "total logical chunks     = %v (%d)\n", sumChunk, int64(sumChunk))
+	textui.Fprintf(out, "total logical addr space = %v (%d)\n", prevEnd, int64(prevEnd))
 }
 
 func PrintPhysicalSpace(out io.Writer, fs *btrfs.FS) {
@@ -62,16 +59,15 @@ func PrintPhysicalSpace(out io.Writer, fs *btrfs.FS) {
 		}
 		if mapping.PAddr.Addr > prevEnd {
 			size := mapping.PAddr.Addr.Sub(prevEnd)
-			fmt.Fprintf(out, "physical_hole paddr=%v size=%v\n", prevEnd, size)
+			textui.Fprintf(out, "physical_hole paddr=%v size=%v\n", prevEnd, size)
 			sumHole += size
 		}
-		fmt.Fprintf(out, "devext dev=%v paddr=%v size=%v laddr=%v\n",
+		textui.Fprintf(out, "devext dev=%v paddr=%v size=%v laddr=%v\n",
 			mapping.PAddr.Dev, mapping.PAddr.Addr, mapping.Size, mapping.LAddr)
 		sumExt += mapping.Size
 		prevEnd = mapping.PAddr.Addr.Add(mapping.Size)
 	}
-	p := message.NewPrinter(message.MatchLanguage("en"))
-	p.Fprintf(out, "total physical holes      = %v (%d)\n", sumHole, int64(sumHole))
-	p.Fprintf(out, "total physical extents    = %v (%d)\n", sumExt, int64(sumExt))
-	p.Fprintf(out, "total physical addr space = %v (%d)\n", prevEnd, int64(prevEnd))
+	textui.Fprintf(out, "total physical holes      = %v (%d)\n", sumHole, int64(sumHole))
+	textui.Fprintf(out, "total physical extents    = %v (%d)\n", sumExt, int64(sumExt))
+	textui.Fprintf(out, "total physical addr space = %v (%d)\n", prevEnd, int64(prevEnd))
 }