Browse Source

Fix up the types in write_sha1_file

Use "unsigned long" for the size, like we do everywhere else.
maint
Linus Torvalds 20 years ago
parent
commit
f5b913c9cb
  1. 2
      cache.h
  2. 4
      sha1_file.c

2
cache.h

@ -121,7 +121,7 @@ extern int write_sha1_buffer(const unsigned char *sha1, void *buf, unsigned int @@ -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);


4
sha1_file.c

@ -231,7 +231,7 @@ void *read_tree_with_tree_or_commit_sha1(const unsigned char *sha1, @@ -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 @@ -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);

Loading…
Cancel
Save