Mercurial > pidgin
diff src/ft.c @ 4517:a2b2cce63fb8
[gaim-migrate @ 4795]
Some changes to handle unknown file sizes better.
committer: Tailor Script <tailor@pidgin.im>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Tue, 04 Feb 2003 17:56:17 +0000 |
| parents | 7521e29658bc |
| children | a6be92358df3 |
line wrap: on
line diff
--- a/src/ft.c Tue Feb 04 15:46:05 2003 +0000 +++ b/src/ft.c Tue Feb 04 17:56:17 2003 +0000 @@ -238,6 +238,9 @@ if (xfer == NULL) return 0.0; + if (gaim_xfer_get_size(xfer) == 0) + return 0.0; + return ((double)gaim_xfer_get_bytes_sent(xfer) / (double)gaim_xfer_get_size(xfer)); } @@ -305,7 +308,7 @@ void gaim_xfer_set_size(struct gaim_xfer *xfer, size_t size) { - if (xfer == NULL || size == 0) + if (xfer == NULL) return; xfer->size = size; @@ -400,7 +403,10 @@ if (xfer == NULL || buffer == NULL) return 0; - s = MIN(gaim_xfer_get_bytes_remaining(xfer), 4096); + if (gaim_xfer_get_size(xfer) == 0) + s = 4096; + else + s = MIN(gaim_xfer_get_bytes_remaining(xfer), 4096); if (xfer->ops.read != NULL) r = xfer->ops.read(buffer, xfer); @@ -477,7 +483,7 @@ if (ui_ops != NULL && ui_ops->update_progress != NULL) ui_ops->update_progress(xfer, gaim_xfer_get_progress(xfer)); - if (xfer->bytes_remaining == 0) + if (r == 0) gaim_xfer_end(xfer); }