From: brian m. carlson Date: Mon, 25 May 2015 18:38:59 GMT Subject: [PATCH v3 33/56] string_list_add_one_ref(): rewrite to take an object_id argument Message-ID: <1432579162-411464-34-git-send-email-sandals@crustytoothpaste.net> In-Reply-To: <1432579162-411464-1-git-send-email-sandals@crustytoothpaste.net> From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- notes.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/notes.c b/notes.c index baa1c41..df08209 100644 --- a/notes.c +++ b/notes.c @@ -918,7 +918,7 @@ out: return ret; } -static int string_list_add_one_ref(const char *refname, const unsigned char *sha1, +static int string_list_add_one_ref(const char *refname, const struct object_id *oid, int flag, void *cb) { struct string_list *refs = cb; @@ -932,12 +932,9 @@ static int string_list_add_one_ref(const char *refname, const unsigned char *sha */ void string_list_add_refs_by_glob(struct string_list *list, const char *glob) { - struct each_ref_fn_sha1_adapter wrapped_string_list_add_one_ref = - {string_list_add_one_ref, list}; - assert(list->strdup_strings); if (has_glob_specials(glob)) { - for_each_glob_ref(each_ref_fn_adapter, glob, &wrapped_string_list_add_one_ref); + for_each_glob_ref(string_list_add_one_ref, glob, list); } else { unsigned char sha1[20]; if (get_sha1(glob, sha1)) -- 2.4.0