Merge branch 'jk/hashcmp-memcmp' into maint

gitster · gitster · commit 822a4d417858 · 2017-09-10T17:02:59.000+09:00
Code clean-up.

* jk/hashcmp-memcmp:
  hashcmp: use memcmp instead of open-coded loop
diff --git a/cache.h b/cache.h
@@ -939,14 +939,7 @@ extern const struct object_id null_oid;
 
 static inline int hashcmp(const unsigned char *sha1, const unsigned char *sha2)
 {
-	int i;
-
-	for (i = 0; i < GIT_SHA1_RAWSZ; i++, sha1++, sha2++) {
-		if (*sha1 != *sha2)
-			return *sha1 - *sha2;
-	}
-
-	return 0;
+	return memcmp(sha1, sha2, GIT_SHA1_RAWSZ);
 }
 
 static inline int oidcmp(const struct object_id *oid1, const struct object_id *oid2)

Original file line number	Diff line number	Diff line change
`@@ -939,14 +939,7 @@ extern const struct object_id null_oid;`
`939`	`939`
`940`	`940`	`static inline int hashcmp(const unsigned char sha1, const unsigned char sha2)`
`941`	`941`	`{`
`942`		`- int i;`
`943`		`-`
`944`		`- for (i = 0; i < GIT_SHA1_RAWSZ; i++, sha1++, sha2++) {`
`945`		`- if (sha1 != sha2)`
`946`		`- return sha1 - sha2;`
`947`		`- }`
`948`		`-`
`949`		`- return 0;`
	`942`	`+ return memcmp(sha1, sha2, GIT_SHA1_RAWSZ);`
`950`	`943`	`}`
`951`	`944`
`952`	`945`	`static inline int oidcmp(const struct object_id oid1, const struct object_id oid2)`