aboutsummaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorRene Scharfe <rene.scharfe@lsrfire.ath.cx>2006-10-15 14:02:03 +0200
committerJunio C Hamano <junkio@cox.net>2006-10-15 12:35:07 -0700
commit972a9155832165ea38febba2303e7c760050b5d8 (patch)
tree942018b630a5e9302445098345ad15e11d311379 /sha1_file.c
parent29f049a0c277be72637f74f1f90a89dccd3475bc (diff)
downloadgit-972a9155832165ea38febba2303e7c760050b5d8.tar.gz
git-972a9155832165ea38febba2303e7c760050b5d8.tar.xz
Make write_sha1_file_prepare() void
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>
Diffstat (limited to 'sha1_file.c')
-rw-r--r--sha1_file.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/sha1_file.c b/sha1_file.c
index d111be74a..66cc7679c 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1347,9 +1347,9 @@ void *read_object_with_reference(const unsigned char *sha1,
}
}
-static char *write_sha1_file_prepare(void *buf, unsigned long len,
- const char *type, unsigned char *sha1,
- unsigned char *hdr, int *hdrlen)
+static void write_sha1_file_prepare(void *buf, unsigned long len,
+ const char *type, unsigned char *sha1,
+ unsigned char *hdr, int *hdrlen)
{
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, buf, len);
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
* 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)
hashcpy(returnsha1, sha1);
if (has_sha1_file(sha1))