refs: use strncmp() instead of strlen() and memcmp()

Simplify ref_entry_cmp_sslice() by using strncmp() to compare the
length-limited key and a NUL-terminated entry.  While we're at it,
retain the const attribute of the input pointers.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/refs.c b/refs.c
index 52709ab7fc41013e1372e95ae508eac721e4c3f0..257472f8e4449911e462e241a515c2e8241ee860 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -322,14 +322,12 @@ struct string_slice {
 
 static int ref_entry_cmp_sslice(const void *key_, const void *ent_)
 {
 
 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;
        if (cmp)
                return cmp;

-       return key->len - entlen;
+       return '\0' - (unsigned char)ent->name[key->len];

 }
 
 /*
 }
 
 /*