e1268af No need to limit calling progressbar_tick() as it is self-limiting — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

No need to limit calling progressbar_tick() as it is self-limiting

Bryan Drewery committed 11 years ago

commit e1268af2232e2f32c84c325d9e072829701b7bc6
parent 74394fe

1 file changed +1 -8

modified libpkg/fetch.c

@@ -460,7 +460,6 @@ pkg_fetch_file_to_fd(struct pkg_repo *repo, const char *url, int dest, time_t *t

 	int64_t		 max_retry, retry;
 	int64_t		 fetch_timeout;
 	time_t		 last = 0;
 	char		 buf[10240];
 	char		*doc = NULL;
 	char		 docpath[MAXPATHLEN];

@@ -603,7 +602,6 @@ pkg_fetch_file_to_fd(struct pkg_repo *repo, const char *url, int dest, time_t *t

 	pkg_emit_fetch_begin(url);
 	pkg_emit_progress_start(NULL);
 	while (done < sz) {
 		time_t	now;
 		int to_read = MIN(sizeof(buf), sz - done);
 		pkg_debug(1, "Reading status: want read %d over %d, %d already done",

@@ -620,12 +618,7 @@ pkg_fetch_file_to_fd(struct pkg_repo *repo, const char *url, int dest, time_t *t

 		done += r;
 		pkg_debug(1, "Read status: %d over %d", done, sz);
 		now = time(NULL);
 		/* Only call the callback every second */
 		if (now > last || done == sz) {
 			pkg_emit_progress_tick(done, sz);
 			last = now;
 		}
 		pkg_emit_progress_tick(done, sz);
 	}
 	if (done < sz) {