X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=unpack-objects.c;h=8ae1a1c0fdab32e6c596872d857f40c5f87b97d4;hb=90279074ca5cc336a8bfffd47d19d089b291b432;hp=19874d004a03531b12922f1bd48a28f18e8d2897;hpb=07ee0d77c66d6f356cd3f82435e67510779aa53c;p=git.git diff --git a/unpack-objects.c b/unpack-objects.c index 19874d00..8ae1a1c0 100644 --- a/unpack-objects.c +++ b/unpack-objects.c @@ -6,7 +6,7 @@ #include static int dry_run, quiet; -static const char unpack_usage[] = "git-unpack-objects < pack-file"; +static const char unpack_usage[] = "git-unpack-objects [-q] < pack-file"; /* We always read in 4kB chunks. */ static unsigned char buffer[4096]; @@ -75,6 +75,7 @@ static void *get_data(unsigned long size) stream.next_in = fill(1); stream.avail_in = len; } + inflateEnd(&stream); return buf; } @@ -167,6 +168,7 @@ static int unpack_delta_entry(unsigned long delta_size) unsigned long base_size; char type[20]; unsigned char base_sha1[20]; + int result; memcpy(base_sha1, fill(20), 20); use(20); @@ -184,7 +186,9 @@ static int unpack_delta_entry(unsigned long delta_size) base = read_sha1_file(base_sha1, type, &base_size); if (!base) die("failed to read delta-pack base object %s", sha1_to_hex(base_sha1)); - return resolve_delta(type, base, base_size, delta_data, delta_size); + result = resolve_delta(type, base, base_size, delta_data, delta_size); + free(base); + return result; } static void unpack_one(unsigned nr, unsigned total)