From 166e51d3a6f81834cc89aec36015f05f350be31e Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Wed, 13 Jul 2022 21:10:10 -0600
Subject: Fix package names/imports

---
 lib/btrfs/btrfsvol/addr.go            | 6 +++---
 lib/btrfs/btrfsvol/blockgroupflags.go | 4 ++--
 lib/btrfs/btrfsvol/lvm.go             | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'lib/btrfs/btrfsvol')

diff --git a/lib/btrfs/btrfsvol/addr.go b/lib/btrfs/btrfsvol/addr.go
index 9df95ce..640a3e8 100644
--- a/lib/btrfs/btrfsvol/addr.go
+++ b/lib/btrfs/btrfsvol/addr.go
@@ -7,7 +7,7 @@ package btrfsvol
 import (
 	"fmt"
 
-	"git.lukeshu.com/btrfs-progs-ng/lib/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/fmtutil"
 )
 
 type (
@@ -20,9 +20,9 @@ func formatAddr(addr int64, f fmt.State, verb rune) {
 	switch verb {
 	case 'v', 's', 'q':
 		str := fmt.Sprintf("%#016x", addr)
-		fmt.Fprintf(f, util.FmtStateString(f, verb), str)
+		fmt.Fprintf(f, fmtutil.FmtStateString(f, verb), str)
 	default:
-		fmt.Fprintf(f, util.FmtStateString(f, verb), addr)
+		fmt.Fprintf(f, fmtutil.FmtStateString(f, verb), addr)
 	}
 }
 
diff --git a/lib/btrfs/btrfsvol/blockgroupflags.go b/lib/btrfs/btrfsvol/blockgroupflags.go
index 4aed12c..4ca5544 100644
--- a/lib/btrfs/btrfsvol/blockgroupflags.go
+++ b/lib/btrfs/btrfsvol/blockgroupflags.go
@@ -5,7 +5,7 @@
 package btrfsvol
 
 import (
-	"git.lukeshu.com/btrfs-progs-ng/lib/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/fmtutil"
 )
 
 type BlockGroupFlags uint64
@@ -43,7 +43,7 @@ var blockGroupFlagNames = []string{
 
 func (f BlockGroupFlags) Has(req BlockGroupFlags) bool { return f&req == req }
 func (f BlockGroupFlags) String() string {
-	ret := util.BitfieldString(f, blockGroupFlagNames, util.HexNone)
+	ret := fmtutil.BitfieldString(f, blockGroupFlagNames, fmtutil.HexNone)
 	if f&BLOCK_GROUP_RAID_MASK == 0 {
 		if ret == "" {
 			ret = "single"
diff --git a/lib/btrfs/btrfsvol/lvm.go b/lib/btrfs/btrfsvol/lvm.go
index 62ca6d7..4d40ccd 100644
--- a/lib/btrfs/btrfsvol/lvm.go
+++ b/lib/btrfs/btrfsvol/lvm.go
@@ -11,10 +11,10 @@ import (
 	"reflect"
 
 	"git.lukeshu.com/btrfs-progs-ng/lib/containers"
-	"git.lukeshu.com/btrfs-progs-ng/lib/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/diskio"
 )
 
-type LogicalVolume[PhysicalVolume util.File[PhysicalAddr]] struct {
+type LogicalVolume[PhysicalVolume diskio.File[PhysicalAddr]] struct {
 	name string
 
 	id2pv map[DeviceID]PhysicalVolume
@@ -23,7 +23,7 @@ type LogicalVolume[PhysicalVolume util.File[PhysicalAddr]] struct {
 	physical2logical map[DeviceID]*containers.RBTree[containers.NativeOrdered[PhysicalAddr], devextMapping]
 }
 
-var _ util.File[LogicalAddr] = (*LogicalVolume[util.File[PhysicalAddr]])(nil)
+var _ diskio.File[LogicalAddr] = (*LogicalVolume[diskio.File[PhysicalAddr]])(nil)
 
 func (lv *LogicalVolume[PhysicalVolume]) init() {
 	if lv.id2pv == nil {
-- 
cgit v1.2.3-2-g168b