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

refs: convert parameter of search_ref_dir() to length-limited string

Browse Source 
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2012-05-22 20:50:39 +02:00 committed by Junio C Hamano
parent aa3bb87176
commit 40ad937d47
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
refs.c
View File

@ -319,19 +319,19 @@ static void sort_ref_dir(struct ref_dir *dir);
* (non-recursively), sorting dir if necessary. Return NULL if no * (non-recursively), sorting dir if necessary. Return NULL if no
* such entry is found. dir must already be complete. * such entry is found. dir must already be complete.
*/ */
static struct ref_entry *search_ref_dir(struct ref_dir *dir, const char *refname) static struct ref_entry *search_ref_dir(struct ref_dir *dir,
const char *refname, size_t len)
{ {
struct ref_entry *e, **r; struct ref_entry *e, **r;
int len;
if (refname == NULL || !dir->nr) if (refname == NULL || !dir->nr)
return NULL; return NULL;
sort_ref_dir(dir); sort_ref_dir(dir);
len = strlen(refname) + 1; e = xmalloc(sizeof(struct ref_entry) + len + 1);
e = xmalloc(sizeof(struct ref_entry) + len);
memcpy(e->name, refname, len); memcpy(e->name, refname, len);
e->name[len] = '\0';
r = bsearch(&e, dir->entries, dir->nr, sizeof(*dir->entries), ref_entry_cmp); r = bsearch(&e, dir->entries, dir->nr, sizeof(*dir->entries), ref_entry_cmp);
@ -353,7 +353,8 @@ static struct ref_entry *search_ref_dir(struct ref_dir *dir, const char *refname
static struct ref_dir *search_for_subdir(struct ref_dir *dir, static struct ref_dir *search_for_subdir(struct ref_dir *dir,
const char *subdirname, int mkdir) const char *subdirname, int mkdir)
{ {
struct ref_entry *entry = search_ref_dir(dir, subdirname); size_t len = strlen(subdirname);
struct ref_entry *entry = search_ref_dir(dir, subdirname, len);
if (!entry) { if (!entry) {
if (!mkdir) if (!mkdir)
return NULL; return NULL;
@ -412,7 +413,7 @@ static struct ref_entry *find_ref(struct ref_dir *dir, const char *refname)
dir = find_containing_dir(dir, refname, 0); dir = find_containing_dir(dir, refname, 0);
if (!dir) if (!dir)
return NULL; return NULL;
entry = search_ref_dir(dir, refname); entry = search_ref_dir(dir, refname, strlen(refname));
return (entry && !(entry->flag & REF_DIR)) ? entry : NULL; return (entry && !(entry->flag & REF_DIR)) ? entry : NULL;
} }