*: BestEffortFprintf as linter wants

4 files changed, 16 insertions, 16 deletions

diff --git a/format/pack/ingest/ingest.go b/format/pack/ingest/ingest.go
index 926a8c6a..e593510b 100644
--- a/format/pack/ingest/ingest.go
+++ b/format/pack/ingest/ingest.go
@@ -51,7 +51,7 @@ func ingest(state *ingestState) (out Result, err error) {
 		return Result{}, err
 	}
 
-	utils.FprintfBestEffort(state.opts.Progress, "writing index...\r")
+	utils.BestEffortFprintf(state.opts.Progress, "writing index...\r")
 
 	err = state.packFile.Sync()
 	if err != nil {
@@ -63,10 +63,10 @@ func ingest(state *ingestState) (out Result, err error) {
 		return Result{}, err
 	}
 
-	utils.FprintfBestEffort(state.opts.Progress, "writing index: done.\n")
+	utils.BestEffortFprintf(state.opts.Progress, "writing index: done.\n")
 
 	if state.opts.WriteRev {
-		utils.FprintfBestEffort(state.opts.Progress, "writing reverse index...\r")
+		utils.BestEffortFprintf(state.opts.Progress, "writing reverse index...\r")
 	}
 
 	err = writeRev(state)
@@ -75,7 +75,7 @@ func ingest(state *ingestState) (out Result, err error) {
 	}
 
 	if state.opts.WriteRev {
-		utils.FprintfBestEffort(state.opts.Progress, "writing reverse index: done.\n")
+		utils.BestEffortFprintf(state.opts.Progress, "writing reverse index: done.\n")
 	}
 
 	return finalizeArtifacts(state)
diff --git a/format/pack/ingest/resolve_all.go b/format/pack/ingest/resolve_all.go
index f172028c..65cfe44b 100644
--- a/format/pack/ingest/resolve_all.go
+++ b/format/pack/ingest/resolve_all.go
@@ -26,7 +26,7 @@ func resolveAll(state *ingestState) error {
 
 	var done uint32
 
-	utils.FprintfBestEffort(state.opts.Progress, "resolving deltas:   0%% (0/%d)\r", pending)
+	utils.BestEffortFprintf(state.opts.Progress, "resolving deltas:   0%% (0/%d)\r", pending)
 
 	for idx := range state.records {
 		if state.records[idx].resolved {
@@ -36,7 +36,7 @@ func resolveAll(state *ingestState) error {
 		done++
 		if done%step == 0 || done == pending {
 			percent := done * 100 / pending
-			utils.FprintfBestEffort(state.opts.Progress, "resolving deltas: %3d%% (%d/%d)\r", percent, done, pending)
+			utils.BestEffortFprintf(state.opts.Progress, "resolving deltas: %3d%% (%d/%d)\r", percent, done, pending)
 		}
 
 		visiting := make(map[int]struct{})
@@ -65,7 +65,7 @@ func resolveAll(state *ingestState) error {
 		state.baseCache.add(idx, ty, content)
 	}
 
-	utils.FprintfBestEffort(state.opts.Progress, "resolving deltas: 100%% (%d/%d), done.\n", pending, pending)
+	utils.BestEffortFprintf(state.opts.Progress, "resolving deltas: 100%% (%d/%d), done.\n", pending, pending)
 
 	return nil
 }
diff --git a/format/pack/ingest/scan.go b/format/pack/ingest/scan.go
index 906149ba..bb94ebc3 100644
--- a/format/pack/ingest/scan.go
+++ b/format/pack/ingest/scan.go
@@ -21,14 +21,14 @@ func streamPackAndScan(state *ingestState) error {
 		state.algo.Size(),
 	)
 
-	utils.FprintfBestEffort(state.opts.Progress, "validating pack header...\r")
+	utils.BestEffortFprintf(state.opts.Progress, "validating pack header...\r")
 
 	err = seedStreamWithPackHeader(state)
 	if err != nil {
 		return err
 	}
 
-	utils.FprintfBestEffort(state.opts.Progress, "validating pack header: done.\n")
+	utils.BestEffortFprintf(state.opts.Progress, "validating pack header: done.\n")
 
 	state.records = make([]objectRecord, 0, state.objectCountHeader)
 	state.ofsDeltas = make([]ofsDeltaRef, 0, state.objectCountHeader)
@@ -36,7 +36,7 @@ func streamPackAndScan(state *ingestState) error {
 
 	total := state.objectCountHeader
 	step := progressStep(total)
-	utils.FprintfBestEffort(state.opts.Progress, "receiving objects:   0%% (0/%d)\r", total)
+	utils.BestEffortFprintf(state.opts.Progress, "receiving objects:   0%% (0/%d)\r", total)
 
 	for i := range total {
 		nextOffset, err := scanOneEntry(state, state.stream.consumed)
@@ -51,11 +51,11 @@ func streamPackAndScan(state *ingestState) error {
 		done := i + 1
 		if done%step == 0 || done == total {
 			percent := done * 100 / total
-			utils.FprintfBestEffort(state.opts.Progress, "receiving objects: %3d%% (%d/%d)\r", percent, done, total)
+			utils.BestEffortFprintf(state.opts.Progress, "receiving objects: %3d%% (%d/%d)\r", percent, done, total)
 		}
 	}
 
-	utils.FprintfBestEffort(state.opts.Progress, "receiving objects: 100%% (%d/%d), done.\n", total, total)
+	utils.BestEffortFprintf(state.opts.Progress, "receiving objects: 100%% (%d/%d), done.\n", total, total)
 
 	err = state.stream.finishAndFlushTrailer(state.opts.RequireTrailingEOF)
 	if err != nil {
diff --git a/format/pack/ingest/thin_fix.go b/format/pack/ingest/thin_fix.go
index f97c0776..634f0367 100644
--- a/format/pack/ingest/thin_fix.go
+++ b/format/pack/ingest/thin_fix.go
@@ -13,7 +13,7 @@ func maybeFixThin(state *ingestState) error {
 		return nil
 	}
 
-	utils.FprintfBestEffort(
+	utils.BestEffortFprintf(
 		state.opts.Progress,
 		"fixing thin pack: %d unresolved bases\r",
 		len(state.unresolvedRefDeltas),
@@ -57,7 +57,7 @@ func maybeFixThin(state *ingestState) error {
 
 	total := len(baseIDs)
 	if total > 0 {
-		utils.FprintfBestEffort(state.opts.Progress, "fixing thin pack:   0%% (0/%d)\r", total)
+		utils.BestEffortFprintf(state.opts.Progress, "fixing thin pack:   0%% (0/%d)\r", total)
 	}
 
 	for i, id := range baseIDs {
@@ -75,7 +75,7 @@ func maybeFixThin(state *ingestState) error {
 
 		done := i + 1
 		percent := done * 100 / total
-		utils.FprintfBestEffort(state.opts.Progress, "fixing thin pack: %3d%% (%d/%d)\r", percent, done, total)
+		utils.BestEffortFprintf(state.opts.Progress, "fixing thin pack: %3d%% (%d/%d)\r", percent, done, total)
 	}
 
 	err = rewritePackHeaderAndTrailer(state)
@@ -84,7 +84,7 @@ func maybeFixThin(state *ingestState) error {
 	}
 
 	if state.thinFixed {
-		utils.FprintfBestEffort(state.opts.Progress, "fixing thin pack: 100%% (%d/%d), done.\n", total, total)
+		utils.BestEffortFprintf(state.opts.Progress, "fixing thin pack: 100%% (%d/%d), done.\n", total, total)
 	}
 
 	return nil