aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2004-05-05 14:22:46 +0000
committerDaniel Stenberg <daniel@haxx.se>2004-05-05 14:22:46 +0000
commit9cf04dff6a31906b53e2cbc3308dcdb6c24105fa (patch)
treefa2223e7bc79eb35a91b135a920dedb89efc6f02
parent6bdcfecbcf587e8ac39d9f6e51b81dcdb361f977 (diff)
hm, avoid division by zero more carefully with that new percentage math
-rw-r--r--lib/progress.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/progress.c b/lib/progress.c
index d93d03f4c..7ff1dd004 100644
--- a/lib/progress.c
+++ b/lib/progress.c
@@ -360,7 +360,7 @@ int Curl_pgrsUpdate(struct connectdata *conn)
/* Figure out the estimated time of arrival for the upload */
if((data->progress.flags & PGRS_UL_SIZE_KNOWN) &&
- (data->progress.ulspeed > 0)) {
+ (data->progress.ulspeed > 100)) {
ulestimate = (long)(data->progress.size_ul / data->progress.ulspeed);
ulpercen = (long)(100*(data->progress.uploaded/100) /
(data->progress.size_ul/100) );
@@ -368,7 +368,7 @@ int Curl_pgrsUpdate(struct connectdata *conn)
/* ... and the download */
if((data->progress.flags & PGRS_DL_SIZE_KNOWN) &&
- (data->progress.dlspeed > 0)) {
+ (data->progress.dlspeed > 100)) {
dlestimate = (long)(data->progress.size_dl / data->progress.dlspeed);
dlpercen = (long)(100*(data->progress.downloaded/100) /
(data->progress.size_dl/100));
@@ -394,7 +394,7 @@ int Curl_pgrsUpdate(struct connectdata *conn)
total_transfer = data->progress.downloaded + data->progress.uploaded;
/* Get the percentage of data transfered so far */
- if(total_expected_transfer > 0)
+ if(total_expected_transfer > 100)
total_percen=(int)(100*(total_transfer/100) /
(total_expected_transfer/100) );