Replace open-coded version of hash_sha1_file()

Rene Scharfe · Junio C Hamano · commit 7cfb5f367e50 · 2006-10-15T12:35:25.000-07:00
Signed-off-by: Rene Scharfe &lt;rene.scharfe@lsrfire.ath.cx&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git a/sha1_file.c b/sha1_file.c
@@ -671,14 +671,8 @@ static void reprepare_packed_git(void)
 
 int check_sha1_signature(const unsigned char *sha1, void *map, unsigned long size, const char *type)
 {
-	char header[100];
 	unsigned char real_sha1[20];
-	SHA_CTX c;
-
-	SHA1_Init(&c);
-	SHA1_Update(&c, header, 1+sprintf(header, "%s %lu", type, size));
-	SHA1_Update(&c, map, size);
-	SHA1_Final(real_sha1, &c);
+	hash_sha1_file(map, size, type, real_sha1);
 	return hashcmp(sha1, real_sha1) ? -1 : 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -671,14 +671,8 @@ static void reprepare_packed_git(void)`
`671`	`671`
`672`	`672`	`int check_sha1_signature(const unsigned char sha1, void map, unsigned long size, const char *type)`
`673`	`673`	`{`
`674`		`- char header[100];`
`675`	`674`	`unsigned char real_sha1[20];`
`676`		`- SHA_CTX c;`
`677`		`-`
`678`		`- SHA1_Init(&c);`
`679`		`- SHA1_Update(&c, header, 1+sprintf(header, "%s %lu", type, size));`
`680`		`- SHA1_Update(&c, map, size);`
`681`		`- SHA1_Final(real_sha1, &c);`
	`675`	`+ hash_sha1_file(map, size, type, real_sha1);`
`682`	`676`	`return hashcmp(sha1, real_sha1) ? -1 : 0;`
`683`	`677`	`}`
`684`	`678`