In this case decompression helper conversion is
quite similar and not too complex, so they go
togheter.
Also in index-pack.c pass correct arguments
to decompress_next_from().
Signed-off-by: Marco Costalba <mcostalba@gmail.com>
---
builtin-pack-objects.c | 14 ++++++--------
builtin-unpack-objects.c | 22 +++++++++-------------
index-pack.c | 4 +++-
3 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 991a30f..43614ce 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -302,19 +302,17 @@ static int check_pack_inflate(struct packed_git *p,
{
z_stream stream;
unsigned char fakebuf[4096], *in;
+ unsigned int in_size = 0;
int st;
- memset(&stream, 0, sizeof(stream));
- inflateInit(&stream);
+ decompress_alloc(&stream);
do {
- in = use_pack(p, w_curs, offset, &stream.avail_in);
- stream.next_in = in;
- stream.next_out = fakebuf;
- stream.avail_out = sizeof(fakebuf);
- st = inflate(&stream, Z_FINISH);
+ decompress_into(&stream, fakebuf, sizeof(fakebuf));
+ in = use_pack(p, w_curs, offset, &in_size);
+ st = decompress_next_from(&stream, in, in_size, Z_FINISH);
offset += stream.next_in - in;
} while (st == Z_OK || st == Z_BUF_ERROR);
- inflateEnd(&stream);
+ decompress_free(&stream);
return (st == Z_STREAM_END &&
stream.total_out == expect &&
stream.total_in == len) ? 0 : -1;
diff --git a/builtin-unpack-objects.c b/builtin-unpack-objects.c
index 1e51865..c996560 100644
--- a/builtin-unpack-objects.c
+++ b/builtin-unpack-objects.c
@@ -1,5 +1,6 @@
#include "builtin.h"
#include "cache.h"
+#include "compress.h"
#include "object.h"
#include "delta.h"
#include "pack.h"
@@ -61,23 +62,20 @@ static void use(int bytes)
static void *get_data(unsigned long size)
{
z_stream stream;
- void *buf = xmalloc(size);
+ unsigned char *buf = xmalloc(size);;
- memset(&stream, 0, sizeof(stream));
-
- stream.next_out = buf;
- stream.avail_out = size;
- stream.next_in = fill(1);
- stream.avail_in = len;
- inflateInit(&stream);
+ decompress_alloc(&stream);
+ decompress_into(&stream, buf, size);
for (;;) {
- int ret = inflate(&stream, 0);
+ /* fill() modifies len, so be sure is evaluated as first */
+ void* tmp = fill(1);
+ int ret = decompress_next_from(&stream, tmp, len, Z_NO_FLUSH);
use(len - stream.avail_in);
if (stream.total_out == size && ret == Z_STREAM_END)
break;
if (ret != Z_OK) {
- error("inflate returned %d\n", ret);
+ error("decompress returned %d\n", ret);
free(buf);
buf = NULL;
if (!recover)
@@ -85,10 +83,8 @@ static void *get_data(unsigned long size)
has_errors = 1;
break;
}
- stream.next_in = fill(1);
- stream.avail_in = len;
}
- inflateEnd(&stream);
+ decompress_free(&stream);
return buf;
}
diff --git a/index-pack.c b/index-pack.c
index 30d7837..929de39 100644
--- a/index-pack.c
+++ b/index-pack.c
@@ -173,7 +173,9 @@ static void *unpack_entry_data(unsigned long offset, unsigned long size)
decompress_into(&stream, buf, size);
for (;;) {
- int ret = decompress_next_from(&stream, fill(1), input_len, Z_NO_FLUSH);
+ /* fill() modifies len, so be sure is evaluated as first */
+ void* tmp = fill(1);
+ int ret = decompress_next_from(&stream, tmp, input_len, Z_NO_FLUSH);
use(input_len - stream.avail_in);
if (stream.total_out == size && ret == Z_STREAM_END)
break;
--
1.5.4.rc4.39.g524a
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
