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

pack-objects: move compression code in a separate function

Browse Source 
A later patch will make use of that code too.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nicolas Pitre 2008-05-02 15:11:49 -04:00 committed by Junio C Hamano
parent 2c5ef82463
commit 30ebb40aa1
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
builtin-pack-objects.c
View File

@ -124,6 +124,32 @@ static void *get_delta(struct object_entry *entry)
return delta_buf; return delta_buf;
} }
static unsigned long do_compress(void **pptr, unsigned long size)
{
z_stream stream;
void *in, *out;
unsigned long maxsize;
memset(&stream, 0, sizeof(stream));
deflateInit(&stream, pack_compression_level);
maxsize = deflateBound(&stream, size);
in = *pptr;
out = xmalloc(maxsize);
*pptr = out;
stream.next_in = in;
stream.avail_in = size;
stream.next_out = out;
stream.avail_out = maxsize;
while (deflate(&stream, Z_FINISH) == Z_OK)
; /* nothing */
deflateEnd(&stream);
free(in);
return stream.total_out;
}
/* /*
* The per-object header is a pretty dense thing, which is * The per-object header is a pretty dense thing, which is
* - first byte: low four bits are "size", then three bits of "type", * - first byte: low four bits are "size", then three bits of "type",
@ -226,11 +252,10 @@ static unsigned long write_object(struct sha1file *f,
struct object_entry *entry, struct object_entry *entry,
off_t write_offset) off_t write_offset)
{ {
unsigned long size, limit; unsigned long size, limit, datalen;
void *buf; void *buf;
unsigned char header[10], dheader[10]; unsigned char header[10], dheader[10];
unsigned hdrlen; unsigned hdrlen;
off_t datalen;
enum object_type type; enum object_type type;
int usable_delta, to_reuse; int usable_delta, to_reuse;
@ -272,9 +297,6 @@ static unsigned long write_object(struct sha1file *f,
*/ */
if (!to_reuse) { if (!to_reuse) {
z_stream stream;
unsigned long maxsize;
void *out;
if (!usable_delta) { if (!usable_delta) {
buf = read_sha1_file(entry->idx.sha1, &type, &size); buf = read_sha1_file(entry->idx.sha1, &type, &size);
if (!buf) if (!buf)
@ -291,20 +313,7 @@ static unsigned long write_object(struct sha1file *f,
type = (allow_ofs_delta && entry->delta->idx.offset) ? type = (allow_ofs_delta && entry->delta->idx.offset) ?
OBJ_OFS_DELTA : OBJ_REF_DELTA; OBJ_OFS_DELTA : OBJ_REF_DELTA;
} }
/* compress the data to store and put compressed length in datalen */ datalen = do_compress(&buf, size);
memset(&stream, 0, sizeof(stream));
deflateInit(&stream, pack_compression_level);
maxsize = deflateBound(&stream, size);
out = xmalloc(maxsize);
/* Compress it */
stream.next_in = buf;
stream.avail_in = size;
stream.next_out = out;
stream.avail_out = maxsize;
while (deflate(&stream, Z_FINISH) == Z_OK)
/* nothing */;
deflateEnd(&stream);
datalen = stream.total_out;
/* /*
* The object header is a byte of 'type' followed by zero or * The object header is a byte of 'type' followed by zero or
@ -324,7 +333,6 @@ static unsigned long write_object(struct sha1file *f,
while (ofs >>= 7) while (ofs >>= 7)
dheader[--pos] = 128 | (--ofs & 127); dheader[--pos] = 128 | (--ofs & 127);
if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) { if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) {
free(out);
free(buf); free(buf);
return 0; return 0;
} }
@ -337,7 +345,6 @@ static unsigned long write_object(struct sha1file *f,
* an additional 20 bytes for the base sha1. * an additional 20 bytes for the base sha1.
*/ */
if (limit && hdrlen + 20 + datalen + 20 >= limit) { if (limit && hdrlen + 20 + datalen + 20 >= limit) {
free(out);
free(buf); free(buf);
return 0; return 0;
} }
@ -346,14 +353,12 @@ static unsigned long write_object(struct sha1file *f,
hdrlen += 20; hdrlen += 20;
} else { } else {
if (limit && hdrlen + datalen + 20 >= limit) { if (limit && hdrlen + datalen + 20 >= limit) {
free(out);
free(buf); free(buf);
return 0; return 0;
} }
sha1write(f, header, hdrlen); sha1write(f, header, hdrlen);
} }
sha1write(f, out, datalen); sha1write(f, buf, datalen);
free(out);
free(buf); free(buf);
} }
else { else {