From: Michael Haggerty <mhagger@alum.mit.edu> To: Junio C Hamano <gitster@pobox.com> Cc: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>, David Turner <novalis@novalis.org>, Jeff King <peff@peff.net>, git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu> Subject: [PATCH 20/20] do_for_each_entry_in_dir(): delete function Date: Mon, 20 Mar 2017 17:33:25 +0100 Message-ID: <3af807ae6f18cb0fb93bb96148bbed84a96ac7ab.1490026594.git.mhagger@alum.mit.edu> (raw) In-Reply-To: <cover.1490026594.git.mhagger@alum.mit.edu> Its only remaining caller was itself. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> --- refs/ref-cache.c | 21 --------------------- refs/ref-cache.h | 11 ----------- 2 files changed, 32 deletions(-) diff --git a/refs/ref-cache.c b/refs/ref-cache.c index b3a30350d7..6059362f1d 100644 --- a/refs/ref-cache.c +++ b/refs/ref-cache.c @@ -316,27 +316,6 @@ static void sort_ref_dir(struct ref_dir *dir) dir->sorted = dir->nr = i; } -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); - 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); - retval = do_for_each_entry_in_dir(subdir, fn, cb_data); - } else { - retval = fn(entry, cb_data); - } - if (retval) - return retval; - } - return 0; -} - /* * Load all of the refs from `dir` (recursively) into our in-memory * cache. diff --git a/refs/ref-cache.h b/refs/ref-cache.h index 5e7a918ac0..ffdc54f3f0 100644 --- a/refs/ref-cache.h +++ b/refs/ref-cache.h @@ -251,17 +251,6 @@ struct ref_iterator *cache_ref_iterator_begin(struct ref_cache *cache, const char *prefix, int prime_dir); -typedef int each_ref_entry_fn(struct ref_entry *entry, void *cb_data); - -/* - * 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, - each_ref_entry_fn fn, void *cb_data); - /* * Peel the entry (if possible) and return its new peel_status. If * repeel is true, re-peel the entry even if there is an old peeled -- 2.11.0
next prev parent reply index Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-20 16:33 [PATCH 00/20] Separate `ref_cache` into a separate module Michael Haggerty 2017-03-20 16:33 ` [PATCH 01/20] get_ref_dir(): don't call read_loose_refs() for "refs/bisect" Michael Haggerty 2017-03-20 16:33 ` [PATCH 02/20] refs_read_raw_ref(): new function Michael Haggerty 2017-03-20 16:33 ` [PATCH 03/20] refs_ref_iterator_begin(): " Michael Haggerty 2017-03-20 16:33 ` [PATCH 04/20] refs_verify_refname_available(): implement once for all backends Michael Haggerty 2017-03-20 17:42 ` Jeff King 2017-03-20 22:20 ` Michael Haggerty 2017-03-20 16:33 ` [PATCH 05/20] refs_verify_refname_available(): use function in more places Michael Haggerty 2017-03-20 16:33 ` [PATCH 06/20] Rename `add_ref()` to `add_ref_entry()` Michael Haggerty 2017-03-20 16:33 ` [PATCH 07/20] Rename `find_ref()` to `find_ref_entry()` Michael Haggerty 2017-03-20 16:33 ` [PATCH 08/20] Rename `remove_entry()` to `remove_entry_from_dir()` Michael Haggerty 2017-03-20 16:33 ` [PATCH 09/20] refs: split `ref_cache` code into separate files Michael Haggerty 2017-03-20 17:49 ` Jeff King 2017-03-20 19:47 ` Junio C Hamano 2017-03-20 20:35 ` Stefan Beller 2017-03-20 22:40 ` Junio C Hamano 2017-03-20 16:33 ` [PATCH 10/20] ref-cache: introduce a new type, ref_cache Michael Haggerty 2017-03-20 16:33 ` [PATCH 11/20] refs: record the ref_store in ref_cache, not ref_dir Michael Haggerty 2017-03-20 17:51 ` Jeff King 2017-03-20 22:39 ` Michael Haggerty 2017-03-20 16:33 ` [PATCH 12/20] ref-cache: use a callback function to fill the cache Michael Haggerty 2017-03-20 16:33 ` [PATCH 13/20] refs: handle "refs/bisect/" in `loose_fill_ref_dir()` Michael Haggerty 2017-03-20 16:33 ` [PATCH 14/20] do_for_each_entry_in_dir(): eliminate `offset` argument Michael Haggerty 2017-03-20 16:33 ` [PATCH 15/20] get_loose_ref_dir(): function renamed from get_loose_refs() Michael Haggerty 2017-03-20 16:33 ` [PATCH 16/20] get_loose_ref_cache(): new function Michael Haggerty 2017-03-20 16:33 ` [PATCH 17/20] cache_ref_iterator_begin(): make function smarter Michael Haggerty 2017-03-20 16:33 ` [PATCH 18/20] commit_packed_refs(): use reference iteration Michael Haggerty 2017-03-20 18:05 ` Jeff King 2017-03-22 8:42 ` Michael Haggerty 2017-03-22 13:06 ` Jeff King 2017-03-20 16:33 ` [PATCH 19/20] files_pack_refs(): " Michael Haggerty 2017-03-20 16:33 ` Michael Haggerty [this message] 2017-03-20 17:25 ` [PATCH 00/20] Separate `ref_cache` into a separate module Junio C Hamano 2017-03-20 18:12 ` Jeff King 2017-03-20 18:24 ` Ævar Arnfjörð Bjarmason 2017-03-20 18:30 ` Jeff King 2017-03-20 22:32 ` Junio C Hamano 2017-03-20 22:48 ` Michael Haggerty
Reply instructions: You may reply publically to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=3af807ae6f18cb0fb93bb96148bbed84a96ac7ab.1490026594.git.mhagger@alum.mit.edu \ --to=mhagger@alum.mit.edu \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ --cc=novalis@novalis.org \ --cc=pclouds@gmail.com \ --cc=peff@peff.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
git@vger.kernel.org mailing list mirror (one of many) Archives are clonable: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.org/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ or Tor2web: https://www.tor2web.org/ AGPL code for this site: git clone https://public-inbox.org/ public-inbox