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>
Jeff King committed
Jul 10, 2023 at 17:12 UTC
bf1377a12b904a01692be9f0fd5746c7e71c8878
1 file changed
+8
-7
refs.c
+8
-7
@@ -375,8 +375,8 @@ char *resolve_refdup(const char *refname, int resolve_flags,
375
oid, flags);
376
}
377
378
-/* The argument to filter_refs */
379
-struct ref_filter {
378
+/* The argument to for_each_filter_refs */
379
+struct for_each_ref_filter {
380
const char *pattern;
381
const char *prefix;
382
each_ref_fn *fn;
@@ -409,10 +409,11 @@ int ref_exists(const char *refname)
409
return refs_ref_exists(get_main_ref_store(the_repository), refname);
410
}
411
412
-static int filter_refs(const char *refname, const struct object_id *oid,
413
- int flags, void *data)
412
+static int for_each_filter_refs(const char *refname,
413
+ const struct object_id *oid,
414
+ int flags, void *data)
415
{
415
- struct ref_filter *filter = (struct ref_filter *)data;
416
+ struct for_each_ref_filter *filter = data;
417
418
if (wildmatch(filter->pattern, refname, 0))
419
return 0;
@@ -569,7 +570,7 @@ int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,
570
const char *prefix, void *cb_data)
571
{
572
struct strbuf real_pattern = STRBUF_INIT;
572
- struct ref_filter filter;
573
+ struct for_each_ref_filter filter;
574
int ret;
575
576
if (!prefix && !starts_with(pattern, "refs/"))
@@ -589,7 +590,7 @@ int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,
590
filter.prefix = prefix;
591
filter.fn = fn;
592
filter.cb_data = cb_data;
592
- ret = for_each_ref(filter_refs, &filter);
593
+ ret = for_each_ref(for_each_filter_refs, &filter);
594
595
strbuf_release(&real_pattern);
596
return ret;