undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove dead code from the csum-file interface

Browse Source 
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>
This commit is contained in:
Nicolas Pitre 2007-11-04 22:54:50 -05:00 committed by Junio C Hamano
parent 9ef4272bea
commit ec640ed1cf
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
csum-file.c
View File

@ -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 *sha1fd_throughput(int fd, const char *name, struct progress *tp)
{ {
struct sha1file *f; struct sha1file *f = xmalloc(sizeof(*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);
f->fd = fd; f->fd = fd;
f->error = 0;
f->offset = 0; f->offset = 0;
f->total = 0; f->total = 0;
f->tp = tp; f->tp = tp;
f->name = name;
f->do_crc = 0; f->do_crc = 0;
SHA1_Init(&f->ctx); SHA1_Init(&f->ctx);
return f; return f;

6
csum-file.h
View File

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