cache: update object ID functions for the_hash_algo

bk2204 · gitster · commit 509f6f62a4b0 · 2018-07-16T14:27:38.000-07:00
Most of our code has been converted to use struct object_id for object
IDs.  However, there are some places that still have not, and there are
a variety of places that compare equivalently sized hashes that are not
object IDs.  All of these hashes are artifacts of the internal hash
algorithm in use, and when we switch to NewHash for object storage, all
of these uses will also switch.

Update the hashcpy, hashclr, and hashcmp functions to use the_hash_algo,
since they are used in a variety of places to copy and manipulate
buffers that need to move data into or out of struct object_id.  This
has the effect of making the corresponding oid* functions use
the_hash_algo as well.

Signed-off-by: brian m. carlson &lt;sandals@crustytoothpaste.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/cache.h b/cache.h
@@ -972,7 +972,7 @@ extern const struct object_id null_oid;
 
 static inline int hashcmp(const unsigned char *sha1, const unsigned char *sha2)
 {
-	return memcmp(sha1, sha2, GIT_SHA1_RAWSZ);
+	return memcmp(sha1, sha2, the_hash_algo->rawsz);
 }
 
 static inline int oidcmp(const struct object_id *oid1, const struct object_id *oid2)
@@ -992,7 +992,7 @@ static inline int is_null_oid(const struct object_id *oid)
 
 static inline void hashcpy(unsigned char *sha_dst, const unsigned char *sha_src)
 {
-	memcpy(sha_dst, sha_src, GIT_SHA1_RAWSZ);
+	memcpy(sha_dst, sha_src, the_hash_algo->rawsz);
 }
 
 static inline void oidcpy(struct object_id *dst, const struct object_id *src)
@@ -1009,7 +1009,7 @@ static inline struct object_id *oiddup(const struct object_id *src)
 
 static inline void hashclr(unsigned char *hash)
 {
-	memset(hash, 0, GIT_SHA1_RAWSZ);
+	memset(hash, 0, the_hash_algo->rawsz);
 }
 
 static inline void oidclr(struct object_id *oid)

Original file line number	Diff line number	Diff line change
`@@ -972,7 +972,7 @@ extern const struct object_id null_oid;`
`972`	`972`
`973`	`973`	`static inline int hashcmp(const unsigned char sha1, const unsigned char sha2)`
`974`	`974`	`{`
`975`		`- return memcmp(sha1, sha2, GIT_SHA1_RAWSZ);`
	`975`	`+ return memcmp(sha1, sha2, the_hash_algo->rawsz);`
`976`	`976`	`}`
`977`	`977`
`978`	`978`	`static inline int oidcmp(const struct object_id oid1, const struct object_id oid2)`
`@@ -992,7 +992,7 @@ static inline int is_null_oid(const struct object_id *oid)`
`992`	`992`
`993`	`993`	`static inline void hashcpy(unsigned char sha_dst, const unsigned char sha_src)`
`994`	`994`	`{`
`995`		`- memcpy(sha_dst, sha_src, GIT_SHA1_RAWSZ);`
	`995`	`+ memcpy(sha_dst, sha_src, the_hash_algo->rawsz);`
`996`	`996`	`}`
`997`	`997`
`998`	`998`	`static inline void oidcpy(struct object_id dst, const struct object_id src)`
`@@ -1009,7 +1009,7 @@ static inline struct object_id oiddup(const struct object_id src)`
`1009`	`1009`
`1010`	`1010`	`static inline void hashclr(unsigned char *hash)`
`1011`	`1011`	`{`
`1012`		`- memset(hash, 0, GIT_SHA1_RAWSZ);`
	`1012`	`+ memset(hash, 0, the_hash_algo->rawsz);`
`1013`	`1013`	`}`
`1014`	`1014`
`1015`	`1015`	`static inline void oidclr(struct object_id *oid)`