admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do_for_each_entry_in_dir(): eliminate offset argument

Browse Source 
It was never used.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty
2017-04-16 08:41:36 +02:00
committed by Junio C Hamano
parent e3bf2989ca
commit 5c7bba77b2
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
refs/files-backend.c
View File

@@ -1387,7 +1387,7 @@ static int commit_packed_refs(struct files_ref_store *refs)
fprintf_or_die(out, "%s", PACKED_REFS_HEADER); fprintf_or_die(out, "%s", PACKED_REFS_HEADER);
do_for_each_entry_in_dir(get_packed_ref_dir(packed_ref_cache), 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)) { if (commit_lock_file(packed_ref_cache->lock)) {
save_errno = errno; 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); lock_packed_refs(refs, LOCK_DIE_ON_ERROR);
cbdata.packed_refs = get_packed_refs(refs); 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); pack_if_possible_fn, &cbdata);
if (commit_packed_refs(refs)) if (commit_packed_refs(refs))

6
refs/ref-cache.c
View File

@@ -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) each_ref_entry_fn fn, void *cb_data)
{ {
int i; int i;
assert(dir->sorted == dir->nr); 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]; struct ref_entry *entry = dir->entries[i];
int retval; int retval;
if (entry->flag & REF_DIR) { if (entry->flag & REF_DIR) {
struct ref_dir *subdir = get_ref_dir(entry); struct ref_dir *subdir = get_ref_dir(entry);
sort_ref_dir(subdir); 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 { } else {
retval = fn(entry, cb_data); retval = fn(entry, cb_data);
} }

11
refs/ref-cache.h
View File

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