From c971ddfdcd319fb5cad95aa7047c54ebe6a22d1a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ren=C3=A9=20Scharfe?= Date: Wed, 16 Jan 2013 02:08:16 +0100 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- refs.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/refs.c b/refs.c index 52709ab7fc..257472f8e4 100644 --- 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_) { - 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]; } /* -- 2.11.4.GIT