string_list_add_one_ref(): rewrite to take an object_id argument

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

notes.c

@@ -918,7 +918,7 @@ int combine_notes_cat_sort_uniq(unsigned char *cur_sha1,
 	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))