progress meter: move file name to bb_progress_t. +20 bytes

We were doing expensive unicode conversion on every update

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

2 files changed, 7 insertions, 7 deletions

diff --git a/networking/tftp.c b/networking/tftp.c
index fcd933f6a..2a3991755 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -107,19 +107,19 @@ struct BUG_G_too_big {
 #if ENABLE_FEATURE_TFTP_PROGRESS_BAR
 static void tftp_progress_update(void)
 {
-        bb_progress_update(&G.pmt, G.file, 0, G.pos, G.size);
+        bb_progress_update(&G.pmt, 0, G.pos, G.size);
 }
 static void tftp_progress_init(void)
 {
-        bb_progress_init(&G.pmt);
+        bb_progress_init(&G.pmt, G.file);
         tftp_progress_update();
 }
 static void tftp_progress_done(void)
 {
-        if (G.pmt.inited) {
+        if (is_bb_progress_inited(&G.pmt)) {
                 tftp_progress_update();
                 bb_putchar_stderr('\n');
-                G.pmt.inited = 0;
+                bb_progress_free(p);
         }
 }
 #else
@@ -445,7 +445,7 @@ static int tftp_protocol(
 #if ENABLE_FEATURE_TFTP_PROGRESS_BAR
                 if (ENABLE_TFTP && remote_file) /* tftp */
                         G.pos = (block_nr - 1) * (uoff_t)blksize;
-                if (G.pmt.inited)
+                if (is_bb_progress_inited(&G.pmt))
                         tftp_progress_update();
 #endif
                 /* Was it final ACK? then exit */
diff --git a/networking/wget.c b/networking/wget.c
index d81426e8d..f2d7daf2f 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -81,9 +81,9 @@ static void progress_meter(int flag)
                 return;
 
         if (flag == PROGRESS_START)
-                bb_progress_init(&G.pmt);
+                bb_progress_init(&G.pmt, G.curfile);
 
-        bb_progress_update(&G.pmt, G.curfile, G.beg_range, G.transferred,
+        bb_progress_update(&G.pmt, G.beg_range, G.transferred,
                            G.chunked ? 0 : G.beg_range + G.transferred + G.content_len);
 
         if (flag == PROGRESS_END) {