do_for_each_entry_in_dir(): eliminate `offset` argument

It was never used.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 079ba941ef7f1392d7895e6713daf90f9a2466c4..c0550ad9d6c327e3952ae99ffa3f960f55211f17 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1387,7 +1387,7 @@ static int commit_packed_refs(struct files_ref_store *refs)
 
        fprintf_or_die(out, "%s", PACKED_REFS_HEADER);
        do_for_each_entry_in_dir(get_packed_ref_dir(packed_ref_cache),
 
        fprintf_or_die(out, "%s", PACKED_REFS_HEADER);
        do_for_each_entry_in_dir(get_packed_ref_dir(packed_ref_cache),

-                                0, write_packed_entry_fn, out);
+                                write_packed_entry_fn, out);

 
        if (commit_lock_file(packed_ref_cache->lock)) {
                save_errno = errno;
 
        if (commit_lock_file(packed_ref_cache->lock)) {
                save_errno = errno;


@@ -1581,7 +1581,7 @@ static int files_pack_refs(struct ref_store *ref_store, unsigned int flags)
        lock_packed_refs(refs, LOCK_DIE_ON_ERROR);
        cbdata.packed_refs = get_packed_refs(refs);
 
        lock_packed_refs(refs, LOCK_DIE_ON_ERROR);
        cbdata.packed_refs = get_packed_refs(refs);
 

-       do_for_each_entry_in_dir(get_loose_refs(refs), 0,
+       do_for_each_entry_in_dir(get_loose_refs(refs),

                                 pack_if_possible_fn, &cbdata);
 
        if (commit_packed_refs(refs))
                                 pack_if_possible_fn, &cbdata);
 
        if (commit_packed_refs(refs))

diff --git a/refs/ref-cache.c b/refs/ref-cache.c
index 44440e0c13095cdcceb0641de1ecc70005edb676..38d4c31985f05b64eea854e948ea8ca9299832af 100644 (file)
--- a/refs/ref-cache.c
+++ b/refs/ref-cache.c
@@ -307,18 +307,18 @@ static void sort_ref_dir(struct ref_dir *dir)
        dir->sorted = dir->nr = i;
 }
 
        dir->sorted = dir->nr = i;
 }
 

-int do_for_each_entry_in_dir(struct ref_dir *dir, int offset,
+int do_for_each_entry_in_dir(struct ref_dir *dir,

                             each_ref_entry_fn fn, void *cb_data)
 {
        int i;
        assert(dir->sorted == dir->nr);
                             each_ref_entry_fn fn, void *cb_data)
 {
        int i;
        assert(dir->sorted == dir->nr);

-       for (i = offset; i < dir->nr; i++) {
+       for (i = 0; i < dir->nr; i++) {

                struct ref_entry *entry = dir->entries[i];
                int retval;
                if (entry->flag & REF_DIR) {
                        struct ref_dir *subdir = get_ref_dir(entry);
                        sort_ref_dir(subdir);
                struct ref_entry *entry = dir->entries[i];
                int retval;
                if (entry->flag & REF_DIR) {
                        struct ref_dir *subdir = get_ref_dir(entry);
                        sort_ref_dir(subdir);

-                       retval = do_for_each_entry_in_dir(subdir, 0, fn, cb_data);
+                       retval = do_for_each_entry_in_dir(subdir, fn, cb_data);

                } else {
                        retval = fn(entry, cb_data);
                }
                } else {
                        retval = fn(entry, cb_data);
                }

diff --git a/refs/ref-cache.h b/refs/ref-cache.h
index ed51e80d8835c657e1f3d2c6534614a15b52bc44..6eecdf42768791a0775d265ce156e9af3f7cf03d 100644 (file)
--- a/refs/ref-cache.h
+++ b/refs/ref-cache.h
@@ -258,13 +258,12 @@ struct ref_iterator *cache_ref_iterator_begin(struct ref_dir *dir);
 typedef int each_ref_entry_fn(struct ref_entry *entry, void *cb_data);
 
 /*
 typedef int each_ref_entry_fn(struct ref_entry *entry, void *cb_data);
 
 /*

- * Call fn for each reference in dir that has index in the range
- * offset <= index < dir->nr.  Recurse into subdirectories that are in
- * that index range, sorting them before iterating.  This function
- * does not sort dir itself; it should be sorted beforehand.  fn is
- * called for all references, including broken ones.
+ * Call `fn` for each reference in `dir`. Recurse into subdirectories,
+ * sorting them before iterating. This function does not sort `dir`
+ * itself; it should be sorted beforehand. `fn` is called for all
+ * references, including broken ones.

  */
  */

-int do_for_each_entry_in_dir(struct ref_dir *dir, int offset,
+int do_for_each_entry_in_dir(struct ref_dir *dir,

                             each_ref_entry_fn fn, void *cb_data);
 
 /*
                             each_ref_entry_fn fn, void *cb_data);
 
 /*