Commit Diff

Commit:
46cd746291ccc886182febe93e8bec284bebf7c5
From:
Florian Obser <florian@narrans.de>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
Correctly track if we sent more data since the last time we looked. With the narrow scope of bytes_sent_cur it would always be zero, and we would always update progress. Found by llvm's scan-build (Dead store). OK stsp
Actions:
Patch | Tree
commit - 512073980d39824ebc694507be294838a4dcc904
commit + 46cd746291ccc886182febe93e8bec284bebf7c5
blob - 8052da70da209c46c261cb11f1e58ce7bb95403a
blob + 42a470412128e34ba4390c1f489b93b571f5479c
--- lib/send.c
+++ lib/send.c
@@ -337,7 +337,7 @@ got_send_pack(const char *remote_name, struct got_path
 	int i, nours = 0, ntheirs = 0;
 	size_t nalloc_ours = 0, nalloc_theirs = 0;
 	int refs_to_send = 0, refs_to_delete = 0;
-	off_t bytes_sent = 0;
+	off_t bytes_sent = 0, bytes_sent_cur = 0;
 	struct pack_progress_arg ppa;
 	uint8_t packsha1[SHA1_DIGEST_LENGTH];
 	FILE *packfile = NULL;
@@ -660,7 +660,6 @@ got_send_pack(const char *remote_name, struct got_path
 	while (!done) {
 		int success = 0;
 		char *refname = NULL;
-		off_t bytes_sent_cur = 0;
 		if (cancel_cb) {
 			err = (*cancel_cb)(cancel_arg);
 			if (err)