pretty-print: add format-string version of draw_progress_bar()

We often format the prefix string via asprintf() before, let's hence add
a helper for that.

1 files changed, 9 insertions, 11 deletions

diff --git a/src/partition/repart.c b/src/partition/repart.c
index 1acd5af38c..5427e0a69f 100644
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -5085,21 +5085,19 @@ static int partition_format_verity_sig(Context *context, Partition *p) {
 
 static int progress_bytes(uint64_t n_bytes, void *userdata) {
         Partition *p = ASSERT_PTR(userdata);
-        _cleanup_free_ char *s = NULL;
 
         p->copy_blocks_done += n_bytes;
 
-        if (asprintf(&s, "%s %s %s %s/%s",
-                     strna(p->copy_blocks_path),
-                     special_glyph(SPECIAL_GLYPH_ARROW_RIGHT),
-                     strna(p->definition_path),
-                     FORMAT_BYTES(p->copy_blocks_done),
-                     FORMAT_BYTES(p->copy_blocks_size)) < 0)
-                return log_oom();
+        (void) draw_progress_barf(
+                        p->copy_blocks_done >= p->copy_blocks_size ? 100.0 : /* catch division be zero */
+                        100.0 * (double) p->copy_blocks_done / (double) p->copy_blocks_size,
+                        "%s %s %s %s/%s",
+                        strna(p->copy_blocks_path),
+                        special_glyph(SPECIAL_GLYPH_ARROW_RIGHT),
+                        strna(p->definition_path),
+                        FORMAT_BYTES(p->copy_blocks_done),
+                        FORMAT_BYTES(p->copy_blocks_size));
 
-        draw_progress_bar(s,
-                          p->copy_blocks_done >= p->copy_blocks_size ? 100.0 : /* catch division be zero */
-                          100.0 * (double) p->copy_blocks_done / (double) p->copy_blocks_size);
         return 0;
 }