Decompressing turns out to be more difficult then
comrpessing.
Helpers are more because more are the way
zlib deflate() is used in git.
This patch just introduces the helpers,
still no code change.
Signed-off-by: Marco Costalba <mcostalba@xxxxxxxxx>
---
compress.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
compress.h | 17 ++++++++++++-
2 files changed, 97 insertions(+), 1 deletions(-)
diff --git a/compress.c b/compress.c
index 0d0b9d9..cf9d5ca 100644
--- a/compress.c
+++ b/compress.c
@@ -1,6 +1,10 @@
#include "cache.h"
#include "compress.h"
+/*
+ * Compression helpers
+ */
+
unsigned long compress_alloc(z_stream *stream, int level, unsigned long size)
{
memset(stream, 0, sizeof(*stream));
@@ -55,3 +59,80 @@ unsigned long compress_all(int level, unsigned char *in,
}
return compress_free(&stream);
}
+
+
+/*
+ * Decompression helpers
+ */
+
+int decompress_alloc(z_stream *stream)
+{
+ memset(stream, 0, sizeof(*stream));
+ return inflateInit(stream);
+}
+
+int decompress_from(z_stream *stream, unsigned char *in, unsigned long in_size)
+{
+ stream->next_in = in;
+ stream->avail_in = in_size;
+ return Z_OK;
+}
+
+int decompress_into(z_stream *stream, unsigned char *out, unsigned long out_size)
+{
+ stream->next_out = out;
+ stream->avail_out = out_size;
+ return Z_OK;
+}
+
+int decompress_next(z_stream *stream, int flush)
+{
+ return inflate(stream, flush);
+}
+
+int decompress_next_from(z_stream *stream, unsigned char *in, unsigned long in_size, int flush)
+{
+ decompress_from(stream, in, in_size);
+ return inflate(stream, flush);
+}
+
+int decompress_next_into(z_stream *stream, unsigned char *out, unsigned long out_size, int flush)
+{
+ decompress_into(stream, out, out_size);
+ return inflate(stream, flush);
+}
+
+unsigned long decompress_free(z_stream *stream)
+{
+ inflateEnd(stream);
+ return stream->total_out;
+}
+
+unsigned long decompress_all(unsigned char *in, unsigned long in_size,
+ unsigned char *out, unsigned long out_size)
+{
+/* caller should check for return value != 0 */
+
+ z_stream stream;
+ int st;
+
+ if (decompress_alloc(&stream) != Z_OK)
+ return 0;
+
+ if ( decompress_from(&stream, in, in_size) != Z_OK
+ || decompress_into(&stream, out, out_size) != Z_OK)
+ goto fail;
+
+ do {
+ st = decompress_next(&stream, Z_FINISH);
+ } while (st == Z_OK);
+
+ if (st != Z_STREAM_END)
+ goto fail;
+
+ return decompress_free(&stream);
+
+fail:
+ decompress_free(&stream);
+ return 0;
+}
diff --git a/compress.h b/compress.h
index d73c365..30cc80f 100644
--- a/compress.h
+++ b/compress.h
@@ -6,7 +6,22 @@ extern int compress_start(z_stream *stream, unsigned char *in, unsigned long in_
unsigned char *out, unsigned long out_size);
extern int compress_next(z_stream *stream, int flush);
extern unsigned long compress_free(z_stream *stream);
-extern unsigned long compress_all(int level, unsigned char *data, unsigned long size,
+extern unsigned long compress_all(int level, unsigned char *in, unsigned long in_size,
unsigned char **out);
+
+extern int decompress_alloc(z_stream *stream);
+
+extern int decompress_from(z_stream *stream, unsigned char *in, unsigned long in_size);
+extern int decompress_into(z_stream *stream, unsigned char *out, unsigned long out_size);
+
+extern int decompress_next(z_stream *stream, int flush);
+extern int decompress_next_from(z_stream *stream, unsigned char *in, unsigned long in_size, int flush);
+extern int decompress_next_into(z_stream *stream, unsigned char *out, unsigned long out_size, int flush);
+
+extern unsigned long decompress_free(z_stream *stream);
+
+extern unsigned long decompress_all(unsigned char *in, unsigned long in_size,
+ unsigned char *out, unsigned long out_size);
+
#endif
--
1.5.4.rc4.39.g524a
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
