aboutsummaryrefslogtreecommitdiff
path: root/networking/tftp.c
diff options
context:
space:
mode:
authorGravatar Denys Vlasenko <vda.linux@googlemail.com>2011-02-11 18:56:13 +0100
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2011-02-11 18:56:13 +0100
commitd55e13964916af6a083be881bffdb493af287c1d (patch)
tree399af6f19989d3efedb0a66f0e7b99184b245bb9 /networking/tftp.c
parente52e67cb512e775fd83ca399cc807c363ba59dcc (diff)
downloadbusybox-d55e13964916af6a083be881bffdb493af287c1d.tar.gz
busybox-d55e13964916af6a083be881bffdb493af287c1d.tar.bz2
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>
Diffstat (limited to 'networking/tftp.c')
-rw-r--r--networking/tftp.c10
1 files changed, 5 insertions, 5 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 */