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>
Michael Haggerty committed
Sep 4, 2016 at 18:08 UTC
37b6f6d5f41c493bc083b5ee4c54519f8dd6d46c
3 files changed
+7
-7
refs.c
+1
-1
@@ -1157,7 +1157,7 @@ static int do_for_each_ref(const char *submodule, const char *prefix,
1157
if (!refs)
1158
return 0;
1159
1160
- iter = files_ref_iterator_begin(submodule, prefix, flags);
1160
+ iter = files_ref_iterator_begin(refs, prefix, flags);
1161
iter = prefix_ref_iterator_begin(iter, prefix, trim);
1162
1163
return do_for_each_ref_iterator(iter, fn, cb_data);
refs/files-backend.c
+2
-2
@@ -1863,11 +1863,11 @@ static struct ref_iterator_vtable files_ref_iterator_vtable = {
1863
};
1864
1865
struct ref_iterator *files_ref_iterator_begin(
1866
- const char *submodule,
1866
+ struct ref_store *ref_store,
1867
const char *prefix, unsigned int flags)
1868
{
1869
struct files_ref_store *refs =
1870
- get_files_ref_store(submodule, "ref_iterator_begin");
1870
+ files_downcast(ref_store, 1, "ref_iterator_begin");
1871
struct ref_dir *loose_dir, *packed_dir;
1872
struct ref_iterator *loose_iter, *packed_iter;
1873
struct files_ref_iterator *iter;
refs/refs-internal.h
+4
-4
@@ -404,13 +404,15 @@ struct ref_iterator *prefix_ref_iterator_begin(struct ref_iterator *iter0,
404
const char *prefix,
405
int trim);
406
407
+struct ref_store;
408
+
409
/*
410
* Iterate over the packed and loose references in the specified
409
- * submodule that are within find_containing_dir(prefix). If prefix is
411
+ * ref_store that are within find_containing_dir(prefix). If prefix is
412
* NULL or the empty string, iterate over all references in the
413
* submodule.
414
*/
413
-struct ref_iterator *files_ref_iterator_begin(const char *submodule,
415
+struct ref_iterator *files_ref_iterator_begin(struct ref_store *ref_store,
416
const char *prefix,
417
unsigned int flags);
418
@@ -484,8 +486,6 @@ extern struct ref_iterator *current_ref_iter;
486
int do_for_each_ref_iterator(struct ref_iterator *iter,
487
each_ref_fn fn, void *cb_data);
488
487
-struct ref_store;
488
-
489
/* refs backends */
490
491
/*