{"thread":{"id":"11570","subject":"[PATCH 4/5] Use new decompress helpers in http-push.c","startedAt":"2008-01-10T21:08:25Z","lastAt":"2008-01-10T21:08:25Z","messageCount":1,"participants":["Marco Costalba"],"isPatch":true,"patchVersion":1,"patchTotal":5},"messages":[{"id":"64949","messageId":"e5bfff550801101308v2b89e935v428b1d0898277def@mail.gmail.com","threadId":"11570","inReplyTo":null,"subject":"[PATCH 4/5] Use new decompress helpers in http-push.c","fromName":"Marco Costalba","fromEmail":"mcostalba@gmail.com","sentAt":"2008-01-10T21:08:25Z","receivedAt":"2008-01-10T21:08:25Z","isPatch":true,"sender":{"key":"mcostalba@gmail.com","avatar":null},"body":"Signed-off-by: Marco Costalba <mcostalba@gmail.com>\n---\n http-push.c |   18 +++++++-----------\n 1 files changed, 7 insertions(+), 11 deletions(-)\n\ndiff --git a/http-push.c b/http-push.c\nindex 55d0c94..03b2615 100644\n--- a/http-push.c\n+++ b/http-push.c\n@@ -1,5 +1,6 @@\n #include \"cache.h\"\n #include \"commit.h\"\n+#include \"compress.h\"\n #include \"pack.h\"\n #include \"tag.h\"\n #include \"blob.h\"\n@@ -491,27 +492,22 @@ static void start_put(struct transfer_request\n \thdrlen = sprintf(hdr, \"%s %lu\", typename(type), len) + 1;\n\n \t/* Set it up */\n-\tmemset(&stream, 0, sizeof(stream));\n-\tdeflateInit(&stream, zlib_compression_level);\n-\tsize = deflateBound(&stream, len + hdrlen);\n+\tsize = z_deflate_init(&stream, zlib_compression_level, len + hdrlen);\n \tstrbuf_init(&request->buffer.buf, size);\n \trequest->buffer.posn = 0;\n\n \t/* Compress it */\n-\tstream.next_out = (unsigned char *)request->buffer.buf.buf;\n-\tstream.avail_out = size;\n+\tz_deflate_start(&stream, (void *)hdr, hdrlen,\n+                       (unsigned char *)request->buffer.buf.buf, size);\n\n \t/* First header.. */\n-\tstream.next_in = (void *)hdr;\n-\tstream.avail_in = hdrlen;\n-\twhile (deflate(&stream, 0) == Z_OK)\n-\t\t/* nothing */;\n+\tz_deflate_next(&stream, Z_NO_FLUSH);\n\n \t/* Then the data itself.. */\n \tstream.next_in = unpacked;\n \tstream.avail_in = len;\n-\twhile (deflate(&stream, Z_FINISH) == Z_OK)\n-\t\t/* nothing */;\n+\tz_deflate_next(&stream, Z_FINISH);\n+\n \tdeflateEnd(&stream);\n \tfree(unpacked);\n\n-- \n1.5.4.rc2.89.g1b3f\n"}]}