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

search_ref_dir(): return an index rather than a pointer

Browse Source 
Change search_ref_dir() to return the index of the sought entry (or -1
on error) rather than a pointer to the entry.  This will make it more
natural to use the function for removing an entry from the list.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2013-04-22 21:52:26 +02:00 committed by Junio C Hamano
parent ab292bc4f3
commit 9fc0a64806
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
refs.c
View File

@ -367,18 +367,17 @@ static int ref_entry_cmp_sslice(const void *key_, const void *ent_)
} }
/* /*
* Return the entry with the given refname from the ref_dir * Return the index of the entry with the given refname from the
* (non-recursively), sorting dir if necessary. Return NULL if no * ref_dir (non-recursively), sorting dir if necessary. Return -1 if
* such entry is found. dir must already be complete. * no such entry is found. dir must already be complete.
*/ */
static struct ref_entry *search_ref_dir(struct ref_dir *dir, static int search_ref_dir(struct ref_dir *dir, const char *refname, size_t len)
const char *refname, size_t len)
{ {
struct ref_entry **r; struct ref_entry **r;
struct string_slice key; struct string_slice key;
if (refname == NULL || !dir->nr) if (refname == NULL || !dir->nr)
return NULL; return -1;
sort_ref_dir(dir); sort_ref_dir(dir);
key.len = len; key.len = len;
@ -387,9 +386,9 @@ static struct ref_entry *search_ref_dir(struct ref_dir *dir,
ref_entry_cmp_sslice); ref_entry_cmp_sslice);
if (r == NULL) if (r == NULL)
return NULL; return -1;
return *r; return r - dir->entries;
} }
/* /*
@ -403,8 +402,9 @@ static struct ref_dir *search_for_subdir(struct ref_dir *dir,
const char *subdirname, size_t len, const char *subdirname, size_t len,
int mkdir) int mkdir)
{ {
struct ref_entry *entry = search_ref_dir(dir, subdirname, len); int entry_index = search_ref_dir(dir, subdirname, len);
if (!entry) { struct ref_entry *entry;
if (entry_index == -1) {
if (!mkdir) if (!mkdir)
return NULL; return NULL;
/* /*
@ -415,6 +415,8 @@ static struct ref_dir *search_for_subdir(struct ref_dir *dir,
*/ */
entry = create_dir_entry(dir->ref_cache, subdirname, len, 0); entry = create_dir_entry(dir->ref_cache, subdirname, len, 0);
add_entry_to_dir(dir, entry); add_entry_to_dir(dir, entry);
} else {
entry = dir->entries[entry_index];
} }
return get_ref_dir(entry); return get_ref_dir(entry);
} }
@ -453,12 +455,16 @@ static struct ref_dir *find_containing_dir(struct ref_dir *dir,
*/ */
static struct ref_entry *find_ref(struct ref_dir *dir, const char *refname) static struct ref_entry *find_ref(struct ref_dir *dir, const char *refname)
{ {
int entry_index;
struct ref_entry *entry; struct ref_entry *entry;
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, strlen(refname)); entry_index = search_ref_dir(dir, refname, strlen(refname));
return (entry && !(entry->flag & REF_DIR)) ? entry : NULL; if (entry_index == -1)
return NULL;
entry = dir->entries[entry_index];
return (entry->flag & REF_DIR) ? NULL : entry;
} }
/* /*