[PATCH v2 22/23] refs.c: add methods for the ref iterators
From: Ronnie Sahlberg <hidden>
Date: 2016-06-15 23:02:16
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Ronnie Sahlberg <redacted> --- refs-common.c | 36 ++++++++++++++++++++++++++++++++++++ refs.c | 21 ++++++++++++++------- refs.h | 19 +++++++++++++++++++ 3 files changed, 69 insertions(+), 7 deletions(-)
diff --git a/refs-common.c b/refs-common.c
index f19402b..3df725d 100644
--- a/refs-common.c
+++ b/refs-common.c@@ -928,3 +928,39 @@ int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data) { return refs->head_ref_submodule(submodule, fn, cb_data); } + +int for_each_ref(each_ref_fn fn, void *cb_data) +{ + return refs->for_each_ref(fn, cb_data); +} + +int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data) +{ + return refs->for_each_ref_submodule(submodule, fn, cb_data); +} + +int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data) +{ + return refs->for_each_ref_in(prefix, fn, cb_data); +} + +int for_each_ref_in_submodule(const char *submodule, const char *prefix, + each_ref_fn fn, void *cb_data) +{ + return refs->for_each_ref_in_submodule(submodule, prefix, fn, cb_data); +} + +int for_each_rawref(each_ref_fn fn, void *cb_data) +{ + return refs->for_each_rawref(fn, cb_data); +} + +int for_each_namespaced_ref(each_ref_fn fn, void *cb_data) +{ + return refs->for_each_namespaced_ref(fn, cb_data); +} + +int for_each_replace_ref(each_ref_fn fn, void *cb_data) +{ + return refs->for_each_replace_ref(fn, cb_data); +}
diff --git a/refs.c b/refs.c
index 7ad07f1..dc0467a 100644
--- a/refs.c
+++ b/refs.c@@ -1610,33 +1610,33 @@ static int files_head_ref_submodule(const char *submodule, each_ref_fn fn, void return do_head_ref(submodule, fn, cb_data); } -int for_each_ref(each_ref_fn fn, void *cb_data) +static int files_for_each_ref(each_ref_fn fn, void *cb_data) { return do_for_each_ref(&ref_cache, "", fn, 0, 0, cb_data); } -int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data) +static int files_for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data) { return do_for_each_ref(get_ref_cache(submodule), "", fn, 0, 0, cb_data); } -int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data) +static int files_for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data) { return do_for_each_ref(&ref_cache, prefix, fn, strlen(prefix), 0, cb_data); } -int for_each_ref_in_submodule(const char *submodule, const char *prefix, +static int files_for_each_ref_in_submodule(const char *submodule, const char *prefix, each_ref_fn fn, void *cb_data) { return do_for_each_ref(get_ref_cache(submodule), prefix, fn, strlen(prefix), 0, cb_data); } -int for_each_replace_ref(each_ref_fn fn, void *cb_data) +static int files_for_each_replace_ref(each_ref_fn fn, void *cb_data) { return do_for_each_ref(&ref_cache, "refs/replace/", fn, 13, 0, cb_data); } -int for_each_namespaced_ref(each_ref_fn fn, void *cb_data) +static int files_for_each_namespaced_ref(each_ref_fn fn, void *cb_data) { struct strbuf buf = STRBUF_INIT; int ret;
@@ -1646,7 +1646,7 @@ int for_each_namespaced_ref(each_ref_fn fn, void *cb_data) return ret; } -int for_each_rawref(each_ref_fn fn, void *cb_data) +static int files_for_each_rawref(each_ref_fn fn, void *cb_data) { return do_for_each_ref(&ref_cache, "", fn, 0, DO_FOR_EACH_INCLUDE_BROKEN, cb_data);
@@ -3311,6 +3311,13 @@ struct ref_be refs_files = { files_resolve_gitlink_ref, files_head_ref, files_head_ref_submodule, + files_for_each_ref, + files_for_each_ref_submodule, + files_for_each_ref_in, + files_for_each_ref_in_submodule, + files_for_each_rawref, + files_for_each_namespaced_ref, + files_for_each_replace_ref, }; struct ref_be *refs = &refs_files;
diff --git a/refs.h b/refs.h
index 420e9b5..249a14a 100644
--- a/refs.h
+++ b/refs.h@@ -401,6 +401,18 @@ typedef int (*head_ref_fn)(each_ref_fn fn, void *cb_data); typedef int (*head_ref_submodule_fn)(const char *submodule, each_ref_fn fn, void *cb_data); +typedef int (*for_each_ref_fn)(each_ref_fn fn, void *cb_data); +typedef int (*for_each_ref_submodule_fn)(const char *submodule, each_ref_fn fn, + void *cb_data); +typedef int (*for_each_ref_in_fn)(const char *prefix, each_ref_fn fn, + void *cb_data); +typedef int (*for_each_ref_in_submodule_fn)(const char *submodule, + const char *prefix, + each_ref_fn fn, void *cb_data); +typedef int (*for_each_rawref_fn)(each_ref_fn fn, void *cb_data); +typedef int (*for_each_namespaced_ref_fn)(each_ref_fn fn, void *cb_data); +typedef int (*for_each_replace_ref_fn)(each_ref_fn fn, void *cb_data); + struct ref_be { transaction_begin_fn transaction_begin; transaction_update_sha1_fn transaction_update_sha1;
@@ -423,6 +435,13 @@ struct ref_be { resolve_gitlink_ref_fn resolve_gitlink_ref; head_ref_fn head_ref; head_ref_submodule_fn head_ref_submodule; + for_each_ref_fn for_each_ref; + for_each_ref_submodule_fn for_each_ref_submodule; + for_each_ref_in_fn for_each_ref_in; + for_each_ref_in_submodule_fn for_each_ref_in_submodule; + for_each_rawref_fn for_each_rawref; + for_each_namespaced_ref_fn for_each_namespaced_ref; + for_each_replace_ref_fn for_each_replace_ref; }; extern struct ref_be *refs;
--
2.0.1.556.g3edca4c