Merge branch 'wp/add-patch-find'

diff --git a/sha1_file.c b/sha1_file.c
index 360f7e5a028b4842b152f1fcbd9f39f3a8623b5c..8868b800cbb9259f97b8acac3c8701153118b657 100644 (file)
--- 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;