Skip to content

Commit

Permalink
remove dead code from the csum-file interface
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nicolas Pitre authored and Junio C Hamano committed Nov 5, 2007
1 parent 9ef4272 commit ec640ed
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 15 deletions.
14 changes: 2 additions & 12 deletions csum-file.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions csum-file.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ struct progress;

/* A SHA1-protected file */
struct sha1file {
int fd, error;
unsigned int offset, namelen;
int fd;
unsigned int offset;
SHA_CTX ctx;
off_t total;
struct progress *tp;
char name[PATH_MAX];
const char *name;
int do_crc;
uint32_t crc32;
unsigned char buffer[8192];
Expand Down

0 comments on commit ec640ed

Please sign in to comment.