aboutsummaryrefslogtreecommitdiff
path: root/networking/tftp.c
diff options
context:
space:
mode:
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 {
107#if ENABLE_FEATURE_TFTP_PROGRESS_BAR 107#if ENABLE_FEATURE_TFTP_PROGRESS_BAR
108static void tftp_progress_update(void) 108static void tftp_progress_update(void)
109{ 109{
110 bb_progress_update(&G.pmt, G.file, 0, G.pos, G.size); 110 bb_progress_update(&G.pmt, 0, G.pos, G.size);
111} 111}
112static void tftp_progress_init(void) 112static void tftp_progress_init(void)
113{ 113{
114 bb_progress_init(&G.pmt); 114 bb_progress_init(&G.pmt, G.file);
115 tftp_progress_update(); 115 tftp_progress_update();
116} 116}
117static void tftp_progress_done(void) 117static void tftp_progress_done(void)
118{ 118{
119 if (G.pmt.inited) { 119 if (is_bb_progress_inited(&G.pmt)) {
120 tftp_progress_update(); 120 tftp_progress_update();
121 bb_putchar_stderr('\n'); 121 bb_putchar_stderr('\n');
122 G.pmt.inited = 0; 122 bb_progress_free(p);
123 } 123 }
124} 124}
125#else 125#else
@@ -445,7 +445,7 @@ static int tftp_protocol(
445#if ENABLE_FEATURE_TFTP_PROGRESS_BAR 445#if ENABLE_FEATURE_TFTP_PROGRESS_BAR
446 if (ENABLE_TFTP && remote_file) /* tftp */ 446 if (ENABLE_TFTP && remote_file) /* tftp */
447 G.pos = (block_nr - 1) * (uoff_t)blksize; 447 G.pos = (block_nr - 1) * (uoff_t)blksize;
448 if (G.pmt.inited) 448 if (is_bb_progress_inited(&G.pmt))
449 tftp_progress_update(); 449 tftp_progress_update();
450#endif 450#endif
451 /* Was it final ACK? then exit */ 451 /* Was it final ACK? then exit */