undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* rs/clarify-entry-cmp-sslice:
  refs: use strncmp() instead of strlen() and memcmp()
This commit is contained in:
Junio C Hamano 2013-01-23 21:19:06 -08:00
commit f12e49ae87
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
refs.c
View File

@ -333,14 +333,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_; const struct string_slice *key = key_;
struct ref_entry *ent = *(struct ref_entry **)ent_; const struct ref_entry *ent = *(const struct ref_entry * const *)ent_;
int entlen = strlen(ent->name); int cmp = strncmp(key->str, ent->name, key->len);
int cmplen = key->len < entlen ? key->len : entlen;
int cmp = memcmp(key->str, ent->name, cmplen);
if (cmp) if (cmp)
return cmp; return cmp;
return key->len - entlen; return '\0' - (unsigned char)ent->name[key->len];
} }
/* /*