Code

zlib: wrap remaining calls to direct inflate/inflateEnd
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Jun 2011 17:39:27 +0000 (10:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Jun 2011 17:39:27 +0000 (10:39 -0700)
Two callsites in http-backend.c to inflate() and inflateEnd()
were not using git_ prefixed versions.  After this, running

    $ find all objects -print | xargs nm -ugo | grep inflate

shows only zlib.c makes direct calls to zlib for inflate operation,
except for a singlecall to inflateInit2 in http-backend.c

Signed-off-by: Junio C Hamano <gitster@pobox.com>
http-backend.c

index 85015048dd466fb2f2afe12086379ecf579d0a56..c74cb03a705f4e61c46c7cdb29f507ff12bab27e 100644 (file)
@@ -296,7 +296,7 @@ static void inflate_request(const char *prog_name, int out)
                        stream.next_out = out_buf;
                        stream.avail_out = sizeof(out_buf);
 
-                       ret = inflate(&stream, Z_NO_FLUSH);
+                       ret = git_inflate(&stream, Z_NO_FLUSH);
                        if (ret != Z_OK && ret != Z_STREAM_END)
                                die("zlib error inflating request, result %d", ret);
 
@@ -311,7 +311,7 @@ static void inflate_request(const char *prog_name, int out)
        }
 
 done:
-       inflateEnd(&stream);
+       git_inflate_end(&stream);
        close(out);
 }