From: mhagger@alum.mit.edu Date: Tue, 24 Apr 2012 22:45:20 GMT Subject: [PATCH 14/30] find_ref(): take (ref_entry *) instead of (ref_dir *) Message-ID: <1335307536-26914-15-git-send-email-mhagger@alum.mit.edu> In-Reply-To: <1335307536-26914-1-git-send-email-mhagger@alum.mit.edu> From: Michael Haggerty Signed-off-by: Michael Haggerty --- refs.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/refs.c b/refs.c index 044dee9..c40cbd6 100644 --- a/refs.c +++ b/refs.c @@ -327,14 +327,17 @@ static struct ref_dir *find_containing_dir(struct ref_dir *dir, } /* - * Find the value entry with the given name in dir, sorting ref_dirs - * and recursing into subdirectories as necessary. If the name is not - * found or it corresponds to a directory entry, return NULL. + * Find the value entry with the given name in direntry, sorting + * reference directories and recursing into subdirectories as + * necessary. If the name is not found or it corresponds to a + * directory entry, return NULL. */ -static struct ref_entry *find_ref(struct ref_dir *dir, const char *refname) +static struct ref_entry *find_ref(struct ref_entry *direntry, const char *refname) { struct ref_entry *entry; - dir = find_containing_dir(dir, refname, 0); + struct ref_dir *dir; + assert(direntry->flag & REF_DIR); + dir = find_containing_dir(&direntry->u.subdir, refname, 0); if (!dir) return NULL; entry = search_ref_dir(dir, refname); @@ -858,7 +861,7 @@ static int resolve_gitlink_packed_ref(struct ref_cache *refs, struct ref_entry *ref; struct ref_entry *direntry = get_packed_refs(refs); - ref = find_ref(&direntry->u.subdir, refname); + ref = find_ref(direntry, refname); if (ref == NULL) return -1; @@ -930,7 +933,7 @@ int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *sh static int get_packed_ref(const char *refname, unsigned char *sha1) { struct ref_entry *packed = get_packed_refs(get_ref_cache(NULL)); - struct ref_entry *entry = find_ref(&packed->u.subdir, refname); + struct ref_entry *entry = find_ref(packed, refname); if (entry) { hashcpy(sha1, entry->u.value.sha1); return 0; @@ -1107,7 +1110,7 @@ int peel_ref(const char *refname, unsigned char *sha1) if ((flag & REF_ISPACKED)) { struct ref_entry *direntry = get_packed_refs(get_ref_cache(NULL)); - struct ref_entry *r = find_ref(&direntry->u.subdir, refname); + struct ref_entry *r = find_ref(direntry, refname); if (r != NULL && r->flag & REF_KNOWS_PEELED) { hashcpy(sha1, r->u.value.peeled); @@ -1631,7 +1634,7 @@ static int repack_without_ref(const char *refname) { struct repack_without_ref_sb data; struct ref_entry *packed = get_packed_refs(get_ref_cache(NULL)); - if (find_ref(&packed->u.subdir, refname) == NULL) + if (find_ref(packed, refname) == NULL) return 0; data.refname = refname; data.fd = hold_lock_file_for_update(&packlock, git_path("packed-refs"), 0); -- 1.7.10