[pacman-dev] [PATCH] move prevprogress onto payload handle

[Dave Reisner]

This is a poor place for it, and it will likely move again in the
future, but it's better to have it here than as a static variable.

Initialization of this variable is now no longer necessary as its
zeroed on creation of the payload struct.

Signed-off-by: Dave Reisner <dreisner at archlinux.org>
---
 lib/libalpm/dload.c |   11 +++--------
 lib/libalpm/dload.h |    1 +
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c
index 1e8db1e..d53187b 100644
--- a/lib/libalpm/dload.c
+++ b/lib/libalpm/dload.c
@@ -43,8 +43,6 @@
 #include "handle.h"
 
 #ifdef HAVE_LIBCURL
-static off_t prevprogress; /* last download amount */
-
 static const char *get_filename(const char *url)
 {
 	char *filename = strrchr(url, '/');
@@ -103,19 +101,19 @@ static int curl_progress(void *file, double dltotal, double dlnow,
 
 	total_size = payload->initial_size + (off_t)dltotal;
 
-	if(DOUBLE_EQ(dltotal, 0.0) || prevprogress == total_size) {
+	if(DOUBLE_EQ(dltotal, 0.0) || payload->prevprogress == total_size) {
 		return 0;
 	}
 
 	/* initialize the progress bar here to avoid displaying it when
 	 * a repo is up to date and nothing gets downloaded */
-	if(prevprogress == 0) {
+	if(payload->prevprogress == 0) {
 		payload->handle->dlcb(payload->remote_name, 0, (off_t)dltotal);
 	}
 
 	payload->handle->dlcb(payload->remote_name, current_size, total_size);
 
-	prevprogress = current_size;
+	payload->prevprogress = current_size;
 
 	return 0;
 }
@@ -367,9 +365,6 @@ static int curl_download_internal(struct dload_payload *payload,
 	mask_signal(SIGPIPE, SIG_IGN, &orig_sig_pipe);
 	mask_signal(SIGINT, &inthandler, &orig_sig_int);
 
-	/* Progress 0 - initialize */
-	prevprogress = 0;
-
 	/* perform transfer */
 	handle->curlerr = curl_easy_perform(handle->curl);
 
diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h
index 765c5fd..8a2dbc6 100644
--- a/lib/libalpm/dload.h
+++ b/lib/libalpm/dload.h
@@ -35,6 +35,7 @@ struct dload_payload {
 	char *fileurl;
 	off_t initial_size;
 	off_t max_size;
+	off_t prevprogress;
 	int force;
 	int allow_resume;
 	int errors_ok;
-- 
1.7.6.4