summaryrefslogtreecommitdiff
path: root/csum-file.c
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2007-11-04 22:54:50 -0500
committerJunio C Hamano <gitster@pobox.com>2007-11-05 12:55:33 -0800
commitec640ed1cf1d62730555705ec18b785c43e81f62 (patch)
treeec799e9b53c22d88fc6aa8b7eb877fce29d01f3a /csum-file.c
parent9ef4272bea94b022aa84372c06e211bccd5f8a54 (diff)
downloadgit-ec640ed1cf1d62730555705ec18b785c43e81f62.tar.gz
remove dead code from the csum-file interface
The provided name argument is always constant and valid in every caller's context, so no need to have an array of PATH_MAX chars to copy it into when a simple pointer will do. Unfortunately that means getting rid of wascally wabbits too. The 'error' field is also unused. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'csum-file.c')
-rw-r--r--csum-file.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/csum-file.c b/csum-file.c
index b445e6a2e5..9728a99541 100644
--- a/csum-file.c
+++ b/csum-file.c
@@ -88,22 +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;