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

sha1_file.c: cleanup hdr usage

Browse Source 
Let's have hdr be a simple char pointer/array when possible, and let's
reduce its storage to 32 bytes.  Especially for sha1_loose_object_info()
where 128 bytes is way excessive and wastes extra CPU cycles inflating.

The object type is already restricted to 10 bytes in parse_sha1_header()
and the size, even if it is 64 bits, will fit in 20 decimal numbers.  So
32 bytes is plenty.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Nicolas Pitre 2007-02-26 14:55:55 -05:00 committed by Junio C Hamano
parent 4e4b55dd0f
commit d65a16f6c4
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sha1_file.c
View File

@ -1461,7 +1461,7 @@ static int sha1_loose_object_info(const unsigned char *sha1, char *type, unsigne
unsigned long mapsize, size; unsigned long mapsize, size;
void *map; void *map;
z_stream stream; z_stream stream;
char hdr[128]; char hdr[32];
map = map_sha1_file(sha1, &mapsize); map = map_sha1_file(sha1, &mapsize);
if (!map) if (!map)
@ -1628,12 +1628,12 @@ void *read_object_with_reference(const unsigned char *sha1,
static void write_sha1_file_prepare(void *buf, unsigned long len, static void write_sha1_file_prepare(void *buf, unsigned long len,
const char *type, unsigned char *sha1, const char *type, unsigned char *sha1,
unsigned char *hdr, int *hdrlen) char *hdr, int *hdrlen)
{ {
SHA_CTX c; SHA_CTX c;
/* Generate the header */ /* Generate the header */
*hdrlen = sprintf((char *)hdr, "%s %lu", type, len)+1; *hdrlen = sprintf(hdr, "%s %lu", type, len)+1;
/* Sha1.. */ /* Sha1.. */
SHA1_Init(&c); SHA1_Init(&c);
@ -1740,7 +1740,7 @@ static int write_binary_header(unsigned char *hdr, enum object_type type, unsign
static void setup_object_header(z_stream *stream, const char *type, unsigned long len) static void setup_object_header(z_stream *stream, const char *type, unsigned long len)
{ {
int obj_type, hdr; int obj_type, hdrlen;
if (use_legacy_headers) { if (use_legacy_headers) {
while (deflate(stream, 0) == Z_OK) while (deflate(stream, 0) == Z_OK)
@ -1757,16 +1757,16 @@ static void setup_object_header(z_stream *stream, const char *type, unsigned lon
obj_type = OBJ_TAG; obj_type = OBJ_TAG;
else else
die("trying to generate bogus object of type '%s'", type); die("trying to generate bogus object of type '%s'", type);
hdr = write_binary_header(stream->next_out, obj_type, len); hdrlen = write_binary_header(stream->next_out, obj_type, len);
stream->total_out = hdr; stream->total_out = hdrlen;
stream->next_out += hdr; stream->next_out += hdrlen;
stream->avail_out -= hdr; stream->avail_out -= hdrlen;
} }
int hash_sha1_file(void *buf, unsigned long len, const char *type, int hash_sha1_file(void *buf, unsigned long len, const char *type,
unsigned char *sha1) unsigned char *sha1)
{ {
unsigned char hdr[50]; char hdr[32];
int hdrlen; int hdrlen;
write_sha1_file_prepare(buf, len, type, sha1, hdr, &hdrlen); write_sha1_file_prepare(buf, len, type, sha1, hdr, &hdrlen);
return 0; return 0;
@ -1780,7 +1780,7 @@ int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned cha
unsigned char sha1[20]; unsigned char sha1[20];
char *filename; char *filename;
static char tmpfile[PATH_MAX]; static char tmpfile[PATH_MAX];
unsigned char hdr[50]; char hdr[32];
int fd, hdrlen; int fd, hdrlen;
/* Normally if we have it in the pack then we do not bother writing /* Normally if we have it in the pack then we do not bother writing
@ -1827,7 +1827,7 @@ int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned cha
stream.avail_out = size; stream.avail_out = size;
/* First header.. */ /* First header.. */
stream.next_in = hdr; stream.next_in = (unsigned char *)hdr;
stream.avail_in = hdrlen; stream.avail_in = hdrlen;
setup_object_header(&stream, type, len); setup_object_header(&stream, type, len);
@ -1859,7 +1859,7 @@ static void *repack_object(const unsigned char *sha1, unsigned long *objsize)
unsigned char *unpacked; unsigned char *unpacked;
unsigned long len; unsigned long len;
char type[20]; char type[20];
char hdr[50]; char hdr[32];
int hdrlen; int hdrlen;
void *buf; void *buf;