| Message ID | 20220224191843.103080-1-joaofl@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Cast download progress counters to size_t to avoid data loss and wrong progress report | expand |
On 24.02.22 20:18, João Loureiro wrote: > Before: > [DEBUG ] : SWUPDATE running : [channel_callback_xferinfo] : Downloaded 1% (1 of 880 kB). > [DEBUG ] : SWUPDATE running : [channel_callback_xferinfo] : Downloaded 2% (1 of 1744 kB). > [DEBUG ] : SWUPDATE running : [channel_callback_xferinfo] : Downloaded 3% (1 of 2608 kB). > > After > [DEBUG ] : SWUPDATE running : [channel_callback_xferinfo] : Downloaded 1% (880 of 86760 kB) > [DEBUG ] : SWUPDATE running : [channel_callback_xferinfo] : Downloaded 2% (1744 of 86760 kB) > [DEBUG ] : SWUPDATE running : [channel_callback_xferinfo] : Downloaded 3% (2608 of 86760 kB) > > Signed-off-by: João Loureiro <joaofl@gmail.com> > --- > corelib/channel_curl.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/corelib/channel_curl.c b/corelib/channel_curl.c > index 3ee801f..3a38a31 100644 > --- a/corelib/channel_curl.c > +++ b/corelib/channel_curl.c > @@ -439,7 +439,9 @@ static int channel_callback_xferinfo(void *p, curl_off_t dltotal, curl_off_t dln > else > data->percent = percent; > > - DEBUG("Downloaded %d%% (%lu of %lu kB).", percent, dlnow / 1024, dltotal / 1024); > + DEBUG("Downloaded %d%% (%zu of %zu kB).", percent, > + (size_t)dlnow / 1024, > + (size_t)dltotal / 1024); > swupdate_download_update(percent, dltotal); > > return 0; Applied to -master, thanks ! Best regards, Stefano Babic
diff --git a/corelib/channel_curl.c b/corelib/channel_curl.c index 3ee801f..3a38a31 100644 --- a/corelib/channel_curl.c +++ b/corelib/channel_curl.c @@ -439,7 +439,9 @@ static int channel_callback_xferinfo(void *p, curl_off_t dltotal, curl_off_t dln else data->percent = percent; - DEBUG("Downloaded %d%% (%lu of %lu kB).", percent, dlnow / 1024, dltotal / 1024); + DEBUG("Downloaded %d%% (%zu of %zu kB).", percent, + (size_t)dlnow / 1024, + (size_t)dltotal / 1024); swupdate_download_update(percent, dltotal); return 0;
Before: [DEBUG ] : SWUPDATE running : [channel_callback_xferinfo] : Downloaded 1% (1 of 880 kB). [DEBUG ] : SWUPDATE running : [channel_callback_xferinfo] : Downloaded 2% (1 of 1744 kB). [DEBUG ] : SWUPDATE running : [channel_callback_xferinfo] : Downloaded 3% (1 of 2608 kB). After [DEBUG ] : SWUPDATE running : [channel_callback_xferinfo] : Downloaded 1% (880 of 86760 kB) [DEBUG ] : SWUPDATE running : [channel_callback_xferinfo] : Downloaded 2% (1744 of 86760 kB) [DEBUG ] : SWUPDATE running : [channel_callback_xferinfo] : Downloaded 3% (2608 of 86760 kB) Signed-off-by: João Loureiro <joaofl@gmail.com> --- corelib/channel_curl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)