X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=cache.h;h=2b341166241c7be98fb1012871266ebb910e1226;hb=1c2ef66f63e60539044d1e0cd8fbfbccd2cefc2e;hp=28899b7b7881474eed4a6f3b6fda8db79d5cbc9c;hpb=e9f1878da7be816042c915cdf0542f9325c36209;p=git.git

diff --git a/cache.h b/cache.h
index 28899b7b7..2b3411662 100644
--- a/cache.h
+++ b/cache.h
@@ -511,7 +511,7 @@ struct pathspec {
 	struct pathspec_item {
 		const char *match;
 		int len;
-		unsigned int has_wildcard:1;
+		unsigned int use_wildcard:1;
 	} *items;
 };
 
@@ -676,14 +676,24 @@ extern char *sha1_pack_name(const unsigned char *sha1);
 extern char *sha1_pack_index_name(const unsigned char *sha1);
 extern const char *find_unique_abbrev(const unsigned char *sha1, int);
 extern const unsigned char null_sha1[20];
-static inline int is_null_sha1(const unsigned char *sha1)
+
+static inline int hashcmp(const unsigned char *sha1, const unsigned char *sha2)
 {
-	return !memcmp(sha1, null_sha1, 20);
+	int i;
+
+	for (i = 0; i < 20; i++, sha1++, sha2++) {
+		if (*sha1 != *sha2)
+			return *sha1 - *sha2;
+	}
+
+	return 0;
 }
-static inline int hashcmp(const unsigned char *sha1, const unsigned char *sha2)
+
+static inline int is_null_sha1(const unsigned char *sha1)
 {
-	return memcmp(sha1, sha2, 20);
+	return !hashcmp(sha1, null_sha1);
 }
+
 static inline void hashcpy(unsigned char *sha_dst, const unsigned char *sha_src)
 {
 	memcpy(sha_dst, sha_src, 20);