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>

diff --git a/refs.c b/refs.c
index 3130c0e019350966df84a175c7de2e8a2b53d314..3d007ba02288e96a83cf974dc7962f6f988bef99 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -1157,7 +1157,7 @@ static int do_for_each_ref(const char *submodule, const char *prefix,
        if (!refs)
                return 0;
 
        if (!refs)
                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);
 
        return do_for_each_ref_iterator(iter, fn, cb_data);
        iter = prefix_ref_iterator_begin(iter, prefix, trim);
 
        return do_for_each_ref_iterator(iter, fn, cb_data);

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 9607fbd17aff85d894903b8bb6e2a2dbeef3438b..4918469f343324afc50d16aef5b7f713de52db84 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -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)
 {
        struct files_ref_store *refs =
                const char *prefix, unsigned int flags)
 {
        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_iterator *loose_iter, *packed_iter;
        struct files_ref_iterator *iter;
        struct ref_dir *loose_dir, *packed_dir;
        struct ref_iterator *loose_iter, *packed_iter;
        struct files_ref_iterator *iter;

diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 84c81ad08e2c79a3cadcd2bbcfe43e21cbd1065a..0af10797131d6e1c282a4148b1908445aca18068 100644 (file)
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -404,13 +404,15 @@ struct ref_iterator *prefix_ref_iterator_begin(struct ref_iterator *iter0,
                                               const char *prefix,
                                               int trim);
 
                                               const char *prefix,
                                               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
  * submodule.
  */
  * NULL or the empty string, iterate over all references in the
  * 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,
                                              unsigned int flags);
 
                                              const char *prefix,
                                              unsigned int flags);
 


@@ -484,8 +486,6 @@ extern struct ref_iterator *current_ref_iter;
 int do_for_each_ref_iterator(struct ref_iterator *iter,
                             each_ref_fn fn, void *cb_data);
 
 int do_for_each_ref_iterator(struct ref_iterator *iter,
                             each_ref_fn fn, void *cb_data);
 

-struct ref_store;
-

 /* refs backends */
 
 /*
 /* refs backends */
 
 /*