diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-25 12:04:55 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-25 12:04:55 -0700 |
commit | f5b913c9cb52cee019585375546817cfe5c75426 (patch) | |
tree | ac76484a10f69423169e72f4bf9461b3e3ad880f | |
parent | a44c9a5e2e6d4108452f2c64dbd11f74a83745af (diff) | |
download | git-f5b913c9cb52cee019585375546817cfe5c75426.tar.gz git-f5b913c9cb52cee019585375546817cfe5c75426.tar.xz |
Fix up the types in write_sha1_file
Use "unsigned long" for the size, like we do everywhere else.
-rw-r--r-- | cache.h | 2 | ||||
-rw-r--r-- | sha1_file.c | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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 d2f38f0cd..d98b265bb 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); |