undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make write_sha1_file_prepare() void

Browse Source 
Move file name generation from write_sha1_file_prepare() to the one
caller that cares and make it a void function.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Rene Scharfe 2006-10-15 14:02:03 +02:00 committed by Junio C Hamano
parent 29f049a0c2
commit 972a915583
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sha1_file.c
View File

@ -1347,9 +1347,9 @@ void *read_object_with_reference(const unsigned char *sha1,
} }
} }
static char *write_sha1_file_prepare(void *buf, unsigned long len, static void write_sha1_file_prepare(void *buf, unsigned long len,
const char *type, unsigned char *sha1, const char *type, unsigned char *sha1,
unsigned char *hdr, int *hdrlen) unsigned char *hdr, int *hdrlen)
{ {
SHA_CTX c; SHA_CTX c;
@ -1361,8 +1361,6 @@ static char *write_sha1_file_prepare(void *buf, unsigned long len,
SHA1_Update(&c, hdr, *hdrlen); SHA1_Update(&c, hdr, *hdrlen);
SHA1_Update(&c, buf, len); SHA1_Update(&c, buf, len);
SHA1_Final(sha1, &c); SHA1_Final(sha1, &c);
return sha1_file_name(sha1);
} }
/* /*
@ -1521,7 +1519,8 @@ int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned cha
/* Normally if we have it in the pack then we do not bother writing /* Normally if we have it in the pack then we do not bother writing
* it out into .git/objects/??/?{38} file. * it out into .git/objects/??/?{38} file.
*/ */
filename = write_sha1_file_prepare(buf, len, type, sha1, hdr, &hdrlen); write_sha1_file_prepare(buf, len, type, sha1, hdr, &hdrlen);
filename = sha1_file_name(sha1);
if (returnsha1) if (returnsha1)
hashcpy(returnsha1, sha1); hashcpy(returnsha1, sha1);
if (has_sha1_file(sha1)) if (has_sha1_file(sha1))