progressbar: Remove unnecessary padding from util

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/libpakfire/progressbar.c b/src/libpakfire/progressbar.c
index fe27629c22aacf3c3618905e60ee06ac5ccd71c7..839e6ede4e8002eaf23b83e435a7cec4e1e45eb8 100644 (file)
--- a/src/libpakfire/progressbar.c
+++ b/src/libpakfire/progressbar.c
@@ -558,10 +558,15 @@ PAKFIRE_EXPORT int pakfire_progressbar_add_eta(struct pakfire_progressbar* p) {
 
 static const char* pakfire_progressbar_bytes_transferred(struct pakfire_progressbar* p,
                struct pakfire_progressbar_widget* widget, unsigned int width, void* data) {
-       int r = pakfire_format_size(widget->buffer, sizeof(widget->buffer) - 1, p->value);
+       char buffer[16];
+
+       int r = pakfire_format_size(buffer, sizeof(buffer) - 1, p->value);
        if (r < 0)
                return NULL;
 
+       // Add padding so that the string is always at least five characters long
+       pakfire_string_format(widget->buffer, "%-5s", buffer);
+
        return widget->buffer;
 }
 

diff --git a/src/libpakfire/util.c b/src/libpakfire/util.c
index 02a0047a8e8277405906b09aaa575df64794a381..a6eb41ec08f4f67cfb7263631e903b99c26a7615 100644 (file)
--- a/src/libpakfire/util.c
+++ b/src/libpakfire/util.c
@@ -277,11 +277,11 @@ char* pakfire_string_join(char** list, const char* delim) {
 
 int pakfire_format_size(char* dst, size_t length, double value) {
        const char* units[] = {
-               "%4.0f ",
-               "%4.0fk",
-               "%4.1fM",
-               "%4.1fG",
-               "%4.1fT",
+               "%.0f ",
+               "%.0fk",
+               "%.1fM",
+               "%.1fG",
+               "%.1fT",
                NULL
        };
        const char** unit = units;