summaryrefslogtreecommitdiff
path: root/csum-file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-14 22:04:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-14 22:04:19 (GMT)
commit03edb0a753fbdbfd14ae42a26ffd1e7608919c45 (patch)
tree7417d5812b2c6c4969b69a31a42393982d0d9ddf /csum-file.c
parentdcb83ec18d5a79c438289eb55d9c01c61490d2e4 (diff)
parenta984a06a07cdd0a843eb6107ad56e346d99ac840 (diff)
downloadgit-03edb0a753fbdbfd14ae42a26ffd1e7608919c45.zip
git-03edb0a753fbdbfd14ae42a26ffd1e7608919c45.tar.gz
git-03edb0a753fbdbfd14ae42a26ffd1e7608919c45.tar.bz2
Merge branch 'np/progress'
* np/progress: nicer display of thin pack completion make display of total transferred fully accurate remove dead code from the csum-file interface git-fetch: be even quieter. make display of total transferred more accurate sideband.c: ESC is spelled '\033' not '\e' for portability. fix display overlap between remote and local progress
Diffstat (limited to 'csum-file.c')
-rw-r--r--csum-file.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/csum-file.c b/csum-file.c
index 3729e73..9728a99 100644
--- a/csum-file.c
+++ b/csum-file.c
@@ -18,7 +18,8 @@ static void sha1flush(struct sha1file *f, unsigned int count)
for (;;) {
int ret = xwrite(f->fd, buf, count);
if (ret > 0) {
- display_throughput(f->tp, ret);
+ f->total += ret;
+ display_throughput(f->tp, f->total);
buf = (char *) buf + ret;
count -= ret;
if (count)
@@ -87,21 +88,12 @@ struct sha1file *sha1fd(int fd, const char *name)
struct sha1file *sha1fd_throughput(int fd, const char *name, struct progress *tp)
{
- struct sha1file *f;
- unsigned len;
-
- f = xmalloc(sizeof(*f));
-
- len = strlen(name);
- if (len >= PATH_MAX)
- die("you wascally wabbit, you");
- f->namelen = len;
- memcpy(f->name, name, len+1);
-
+ struct sha1file *f = xmalloc(sizeof(*f));
f->fd = fd;
- f->error = 0;
f->offset = 0;
+ f->total = 0;
f->tp = tp;
+ f->name = name;
f->do_crc = 0;
SHA1_Init(&f->ctx);
return f;