files_ref_iterator_begin(): take a ref_store argument
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
fcc42ea0c9
commit
37b6f6d5f4
2
refs.c
2
refs.c
@ -1157,7 +1157,7 @@ static int do_for_each_ref(const char *submodule, const char *prefix,
|
|||||||
if (!refs)
|
if (!refs)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
iter = files_ref_iterator_begin(submodule, prefix, flags);
|
iter = files_ref_iterator_begin(refs, prefix, flags);
|
||||||
iter = prefix_ref_iterator_begin(iter, prefix, trim);
|
iter = prefix_ref_iterator_begin(iter, prefix, trim);
|
||||||
|
|
||||||
return do_for_each_ref_iterator(iter, fn, cb_data);
|
return do_for_each_ref_iterator(iter, fn, cb_data);
|
||||||
|
@ -1863,11 +1863,11 @@ static struct ref_iterator_vtable files_ref_iterator_vtable = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
struct ref_iterator *files_ref_iterator_begin(
|
struct ref_iterator *files_ref_iterator_begin(
|
||||||
const char *submodule,
|
struct ref_store *ref_store,
|
||||||
const char *prefix, unsigned int flags)
|
const char *prefix, unsigned int flags)
|
||||||
{
|
{
|
||||||
struct files_ref_store *refs =
|
struct files_ref_store *refs =
|
||||||
get_files_ref_store(submodule, "ref_iterator_begin");
|
files_downcast(ref_store, 1, "ref_iterator_begin");
|
||||||
struct ref_dir *loose_dir, *packed_dir;
|
struct ref_dir *loose_dir, *packed_dir;
|
||||||
struct ref_iterator *loose_iter, *packed_iter;
|
struct ref_iterator *loose_iter, *packed_iter;
|
||||||
struct files_ref_iterator *iter;
|
struct files_ref_iterator *iter;
|
||||||
|
@ -404,13 +404,15 @@ struct ref_iterator *prefix_ref_iterator_begin(struct ref_iterator *iter0,
|
|||||||
const char *prefix,
|
const char *prefix,
|
||||||
int trim);
|
int trim);
|
||||||
|
|
||||||
|
struct ref_store;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Iterate over the packed and loose references in the specified
|
* Iterate over the packed and loose references in the specified
|
||||||
* submodule that are within find_containing_dir(prefix). If prefix is
|
* ref_store that are within find_containing_dir(prefix). If prefix is
|
||||||
* NULL or the empty string, iterate over all references in the
|
* NULL or the empty string, iterate over all references in the
|
||||||
* submodule.
|
* submodule.
|
||||||
*/
|
*/
|
||||||
struct ref_iterator *files_ref_iterator_begin(const char *submodule,
|
struct ref_iterator *files_ref_iterator_begin(struct ref_store *ref_store,
|
||||||
const char *prefix,
|
const char *prefix,
|
||||||
unsigned int flags);
|
unsigned int flags);
|
||||||
|
|
||||||
@ -484,8 +486,6 @@ extern struct ref_iterator *current_ref_iter;
|
|||||||
int do_for_each_ref_iterator(struct ref_iterator *iter,
|
int do_for_each_ref_iterator(struct ref_iterator *iter,
|
||||||
each_ref_fn fn, void *cb_data);
|
each_ref_fn fn, void *cb_data);
|
||||||
|
|
||||||
struct ref_store;
|
|
||||||
|
|
||||||
/* refs backends */
|
/* refs backends */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Reference in New Issue
Block a user