diff options
author | Carlos Martín Nieto <cmn@elego.de> | 2011-05-17 12:12:59 +0200 |
---|---|---|
committer | Carlos Martín Nieto <cmn@elego.de> | 2011-05-17 12:12:59 +0200 |
commit | 94711cad3b83445dfcf45a6e0b29b045e06a29f6 (patch) | |
tree | c0b5560d53aac94756a4d9759fdcf25f1582c40f /src/odb_loose.c | |
parent | c0335005495c1b49986d19031557f9df6bf49922 (diff) | |
parent | 335d6c998041f7c44dce48d3bb087c52136d970f (diff) | |
download | libgit2-94711cad3b83445dfcf45a6e0b29b045e06a29f6.tar.gz |
Merge upstream/development
Diffstat (limited to 'src/odb_loose.c')
-rw-r--r-- | src/odb_loose.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/odb_loose.c b/src/odb_loose.c index 4f475f2c3..873dbfa0a 100644 --- a/src/odb_loose.c +++ b/src/odb_loose.c @@ -336,7 +336,6 @@ static int inflate_disk_obj(git_rawobj *out, gitfo_buf *obj) { unsigned char head[64], *buf; z_stream zs; - int z_status; obj_hdr hdr; size_t used; @@ -350,7 +349,7 @@ static int inflate_disk_obj(git_rawobj *out, gitfo_buf *obj) * inflate the initial part of the io buffer in order * to parse the object header (type and size). */ - if ((z_status = start_inflate(&zs, obj, head, sizeof(head))) < Z_OK) + if (start_inflate(&zs, obj, head, sizeof(head)) < Z_OK) return GIT_ERROR; if ((used = get_object_header(&hdr, head)) == 0) |