From 21abc0a9435e9fda807c36df61c08272c73aa52f Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 29 Oct 2024 21:14:54 +0100
Subject: [PATCH] =?utf8?q?pretty-print:=20rename=20draw=5Fprogress=5Fbar?=
 =?utf8?q?=5Fimpl()=E2=86=92draw=5Fprogress=5Fbar=5Funbuffered()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/shared/pretty-print.c |  9 ++++-----
 src/shared/pretty-print.h |  4 ++--
 src/sysupdate/updatectl.c | 14 +++++++-------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/shared/pretty-print.c b/src/shared/pretty-print.c
index 322d5f496dd..18b2da15d4c 100644
--- a/src/shared/pretty-print.c
+++ b/src/shared/pretty-print.c
@@ -461,7 +461,7 @@ bool shall_tint_background(void) {
         return cache != 0;
 }
 
-void draw_progress_bar_impl(const char *prefix, double percentage) {
+void draw_progress_bar_unbuffered(const char *prefix, double percentage) {
         fputc('\r', stderr);
         if (prefix) {
                 fputs(prefix, stderr);
@@ -522,10 +522,9 @@ void draw_progress_bar_impl(const char *prefix, double percentage) {
                 fputs(ANSI_ERASE_TO_END_OF_LINE, stderr);
 
         fputc('\r', stderr);
-
 }
 
-void clear_progress_bar_impl(const char *prefix) {
+void clear_progress_bar_unbuffered(const char *prefix) {
         fputc('\r', stderr);
 
         if (terminal_is_dumb())
@@ -546,10 +545,10 @@ void draw_progress_bar(const char *prefix, double percentage) {
          * unbuffered by default. Let's temporarily turn on full buffering, so that this is passed to the tty
          * as a single buffer, to make things more efficient. */
         WITH_BUFFERED_STDERR;
-        draw_progress_bar_impl(prefix, percentage);
+        draw_progress_bar_unbuffered(prefix, percentage);
 }
 
 void clear_progress_bar(const char *prefix) {
         WITH_BUFFERED_STDERR;
-        clear_progress_bar_impl(prefix);
+        clear_progress_bar_unbuffered(prefix);
 }
diff --git a/src/shared/pretty-print.h b/src/shared/pretty-print.h
index 446f305b733..0c073b60924 100644
--- a/src/shared/pretty-print.h
+++ b/src/shared/pretty-print.h
@@ -55,8 +55,8 @@ bool shall_tint_background(void);
 
 void draw_progress_bar(const char *prefix, double percentage);
 void clear_progress_bar(const char *prefix);
-void draw_progress_bar_impl(const char *prefix, double percentage);
-void clear_progress_bar_impl(const char *prefix);
+void draw_progress_bar_unbuffered(const char *prefix, double percentage);
+void clear_progress_bar_unbuffered(const char *prefix);
 
 static inline FILE* enable_buffering(FILE *f, char *buffer, size_t size) {
         assert(f);
diff --git a/src/sysupdate/updatectl.c b/src/sysupdate/updatectl.c
index e7e4b374da0..7cfccb66f47 100644
--- a/src/sysupdate/updatectl.c
+++ b/src/sysupdate/updatectl.c
@@ -843,23 +843,23 @@ static int update_render_progress(sd_event_source *source, void *userdata) {
                 int progress = PTR_TO_INT(p);
 
                 if (progress == UPDATE_PROGRESS_FAILED) {
-                        clear_progress_bar_impl(target);
+                        clear_progress_bar_unbuffered(target);
                         fprintf(stderr, "%s: %s Unknown failure\n", target, RED_CROSS_MARK());
                         total += 100;
                 } else if (progress == -EALREADY) {
-                        clear_progress_bar_impl(target);
+                        clear_progress_bar_unbuffered(target);
                         fprintf(stderr, "%s: %s Already up-to-date\n", target, GREEN_CHECK_MARK());
                         n--; /* Don't consider this target in the total */
                 } else if (progress < 0) {
-                        clear_progress_bar_impl(target);
+                        clear_progress_bar_unbuffered(target);
                         fprintf(stderr, "%s: %s %s\n", target, RED_CROSS_MARK(), STRERROR(progress));
                         total += 100;
                 } else if (progress == UPDATE_PROGRESS_DONE) {
-                        clear_progress_bar_impl(target);
+                        clear_progress_bar_unbuffered(target);
                         fprintf(stderr, "%s: %s Done\n", target, GREEN_CHECK_MARK());
                         total += 100;
                 } else {
-                        draw_progress_bar_impl(target, progress);
+                        draw_progress_bar_unbuffered(target, progress);
                         fputs("\n", stderr);
                         total += progress;
                 }
@@ -867,9 +867,9 @@ static int update_render_progress(sd_event_source *source, void *userdata) {
 
         if (n > 1) {
                 if (exiting)
-                        clear_progress_bar_impl(target);
+                        clear_progress_bar_unbuffered(target);
                 else {
-                        draw_progress_bar_impl("Total", (double) total / n);
+                        draw_progress_bar_unbuffered("Total", (double) total / n);
                         if (terminal_is_dumb())
                                 fputs("\n", stderr);
                 }
-- 
2.47.3