From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 24 Jan 2013 05:19:06 +0000 (-0800)
Subject: Merge branch 'rs/clarify-entry-cmp-sslice'
X-Git-Tag: v1.8.2-rc0~90
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f12e49ae877ad0644b9b9939b7cb742da98691d2?hp=fa2f83c654f36d666ef7c07e40e0d62a02fbfa06

Merge branch 'rs/clarify-entry-cmp-sslice'

* rs/clarify-entry-cmp-sslice:
refs: use strncmp() instead of strlen() and memcmp()
---

diff --git a/refs.c b/refs.c
index 541fec2065..2962825308 100644
--- a/refs.c
+++ b/refs.c
@@ -333,14 +333,12 @@ struct string_slice {
 
 static int ref_entry_cmp_sslice(const void *key_, const void *ent_)
 {
-	struct string_slice *key = (struct string_slice *)key_;
-	struct ref_entry *ent = *(struct ref_entry **)ent_;
-	int entlen = strlen(ent->name);
-	int cmplen = key->len < entlen ? key->len : entlen;
-	int cmp = memcmp(key->str, ent->name, cmplen);
+	const struct string_slice *key = key_;
+	const struct ref_entry *ent = *(const struct ref_entry * const *)ent_;
+	int cmp = strncmp(key->str, ent->name, key->len);
 	if (cmp)
 		return cmp;
-	return key->len - entlen;
+	return '\0' - (unsigned char)ent->name[key->len];
 }
 
 /*