emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fetch_cb.c: fixed casts when computing ETA.

Browse Source
This commit is contained in:
Juan RP 2013-03-27 16:14:23 +01:00
parent 069f65a2a5
commit ab8cb56c24
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/xbps-install/fetch_cb.c
View File

@ -74,7 +74,7 @@ stat_eta(struct xbps_fetch_cb_data *xfpd, void *cbdata)
elapsed = xfer->last.tv_sec - xfer->start.tv_sec; elapsed = xfer->last.tv_sec - xfer->start.tv_sec;
received = xfpd->file_dloaded - xfpd->file_offset; received = xfpd->file_dloaded - xfpd->file_offset;
expected = xfpd->file_size - xfpd->file_dloaded; expected = xfpd->file_size - xfpd->file_dloaded;
eta = (long)(elapsed * (long)expected / (long)received); eta = (long)((double)elapsed * expected / received);
if (eta > 3600) if (eta > 3600)
snprintf(str, sizeof str, "%02ldh%02ldm", snprintf(str, sizeof str, "%02ldh%02ldm",
eta / 3600, (eta % 3600) / 60); eta / 3600, (eta % 3600) / 60);
@ -112,8 +112,7 @@ stat_bps(struct xbps_fetch_cb_data *xfpd, void *cbdata)
if (compare_double(delta, 0.0001)) { if (compare_double(delta, 0.0001)) {
snprintf(str, sizeof str, "-- stalled --"); snprintf(str, sizeof str, "-- stalled --");
} else { } else {
bps = bps = ((double)(xfpd->file_dloaded-xfpd->file_offset)/delta);
((double)(xfpd->file_dloaded - xfpd->file_offset) / delta);
(void)xbps_humanize_number(size, (int64_t)bps); (void)xbps_humanize_number(size, (int64_t)bps);
snprintf(str, sizeof str, "%s/s", size); snprintf(str, sizeof str, "%s/s", size);
} }