From f5b913c9cb52cee019585375546817cfe5c75426 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 25 Apr 2005 12:04:55 -0700 Subject: [PATCH] Fix up the types in write_sha1_file Use "unsigned long" for the size, like we do everywhere else. --- cache.h | 2 +- sha1_file.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cache.h b/cache.h index 226788a5bb..4ef80c392a 100644 --- a/cache.h +++ b/cache.h @@ -121,7 +121,7 @@ extern int write_sha1_buffer(const unsigned char *sha1, void *buf, unsigned int extern void * map_sha1_file(const unsigned char *sha1, unsigned long *size); extern void * unpack_sha1_file(void *map, unsigned long mapsize, char *type, unsigned long *size); extern void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size); -extern int write_sha1_file(char *buf, unsigned len, const char *type, unsigned char *return_sha1); +extern int write_sha1_file(char *buf, unsigned long len, const char *type, unsigned char *return_sha1); extern int check_sha1_signature(unsigned char *sha1, void *buf, unsigned long size, const char *type); diff --git a/sha1_file.c b/sha1_file.c index d2f38f0cdc..d98b265bbb 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -231,7 +231,7 @@ void *read_tree_with_tree_or_commit_sha1(const unsigned char *sha1, return buffer; } -int write_sha1_file(char *buf, unsigned len, const char *type, unsigned char *returnsha1) +int write_sha1_file(char *buf, unsigned long len, const char *type, unsigned char *returnsha1) { int size; char *compressed; @@ -243,7 +243,7 @@ int write_sha1_file(char *buf, unsigned len, const char *type, unsigned char *re int fd, hdrlen; /* Generate the header */ - hdrlen = sprintf(hdr, "%s %d", type, len)+1; + hdrlen = sprintf(hdr, "%s %lu", type, len)+1; /* Sha1.. */ SHA1_Init(&c);