X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-unpack-objects.c;h=1e51865c52231e80cfdbbb19c8b6fa86ee8855d2;hb=2729cadca22dce2b5bb994581c45a6a71daf7998;hp=c370c7f834f69ba69d5366d47aadab3b6162b095;hpb=96a02f8f6d2192d3686cd1c719044082c89e8391;p=git.git

diff --git a/builtin-unpack-objects.c b/builtin-unpack-objects.c
index c370c7f83..1e51865c5 100644
--- a/builtin-unpack-objects.c
+++ b/builtin-unpack-objects.c
@@ -34,7 +34,7 @@ static void *fill(int min)
 		offset = 0;
 	}
 	do {
-		int ret = xread(0, buffer + len, sizeof(buffer) - len);
+		ssize_t ret = xread(0, buffer + len, sizeof(buffer) - len);
 		if (ret <= 0) {
 			if (!ret)
 				die("early EOF");
@@ -311,7 +311,7 @@ static void unpack_one(unsigned nr)
 static void unpack_all(void)
 {
 	int i;
-	struct progress progress;
+	struct progress *progress = NULL;
 	struct pack_header *hdr = fill(sizeof(struct pack_header));
 	unsigned nr_objects = ntohl(hdr->hdr_entries);
 
@@ -321,18 +321,14 @@ static void unpack_all(void)
 		die("unknown pack file version %d", ntohl(hdr->hdr_version));
 	use(sizeof(struct pack_header));
 
-	if (!quiet) {
-		fprintf(stderr, "Unpacking %d objects\n", nr_objects);
-		start_progress(&progress, "", nr_objects);
-	}
+	if (!quiet)
+		progress = start_progress("Unpacking objects", nr_objects);
 	obj_list = xmalloc(nr_objects * sizeof(*obj_list));
 	for (i = 0; i < nr_objects; i++) {
 		unpack_one(i);
-		if (!quiet)
-			display_progress(&progress, i + 1);
+		display_progress(progress, i + 1);
 	}
-	if (!quiet)
-		stop_progress(&progress);
+	stop_progress(&progress);
 
 	if (delta_list)
 		die("unresolved deltas left after unpacking");