summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-29 00:32:52 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-29 00:32:52 -0800
commit8c95d3c31b5493ea229808669c811ad9102143fe (patch)
tree70ddc31a745d78f57ac09f707e8ec721ade76556 /sha1_file.c
parentf7951e1d97aeb7b3ed359faeab5edf9e870ec8a5 (diff)
parentb296e8fce6de6a40a41b5168dfbe735d11255256 (diff)
downloadgit-8c95d3c31b5493ea229808669c811ad9102143fe.tar.gz
Sync with 1.6.1.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_file.c')
-rw-r--r--sha1_file.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c
index 360f7e5a02..8868b800cb 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2340,7 +2340,8 @@ static int create_tmpfile(char *buffer, size_t bufsiz, const char *filename)
static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen,
void *buf, unsigned long len, time_t mtime)
{
- int fd, size, ret;
+ int fd, ret;
+ size_t size;
unsigned char *compressed;
z_stream stream;
char *filename;