refs.c: rename ref_filter

The refs machinery has its own implementation of a `ref_filter` (used by
`for-each-ref`), which is distinct from the `ref-filter.h` API (also
used by `for-each-ref`, among other things).

Rename the one within refs.c to more clearly indicate its purpose.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2023-07-10 17:12:05 -04:00
committed by Junio C Hamano
parent fe86abd751
commit bf1377a12b

15
refs.c
View File

@ -375,8 +375,8 @@ char *resolve_refdup(const char *refname, int resolve_flags,
oid, flags); oid, flags);
} }
/* The argument to filter_refs */ /* The argument to for_each_filter_refs */
struct ref_filter { struct for_each_ref_filter {
const char *pattern; const char *pattern;
const char *prefix; const char *prefix;
each_ref_fn *fn; each_ref_fn *fn;
@ -409,10 +409,11 @@ int ref_exists(const char *refname)
return refs_ref_exists(get_main_ref_store(the_repository), refname); return refs_ref_exists(get_main_ref_store(the_repository), refname);
} }
static int filter_refs(const char *refname, const struct object_id *oid, static int for_each_filter_refs(const char *refname,
int flags, void *data) const struct object_id *oid,
int flags, void *data)
{ {
struct ref_filter *filter = (struct ref_filter *)data; struct for_each_ref_filter *filter = data;
if (wildmatch(filter->pattern, refname, 0)) if (wildmatch(filter->pattern, refname, 0))
return 0; return 0;
@ -569,7 +570,7 @@ int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,
const char *prefix, void *cb_data) const char *prefix, void *cb_data)
{ {
struct strbuf real_pattern = STRBUF_INIT; struct strbuf real_pattern = STRBUF_INIT;
struct ref_filter filter; struct for_each_ref_filter filter;
int ret; int ret;
if (!prefix && !starts_with(pattern, "refs/")) if (!prefix && !starts_with(pattern, "refs/"))
@ -589,7 +590,7 @@ int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,
filter.prefix = prefix; filter.prefix = prefix;
filter.fn = fn; filter.fn = fn;
filter.cb_data = cb_data; filter.cb_data = cb_data;
ret = for_each_ref(filter_refs, &filter); ret = for_each_ref(for_each_filter_refs, &filter);
strbuf_release(&real_pattern); strbuf_release(&real_pattern);
return ret; return ret;