From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: christian.couder@gmail.com, Matthieu.Moy@grenoble-inp.fr,
Karthik Nayak <karthik.188@gmail.com>
Subject: [WIP/PATCH v5 09/10] for-each-ref: introduce filter_refs()
Date: Sat, 6 Jun 2015 12:39:40 +0530 [thread overview]
Message-ID: <1433574581-23980-9-git-send-email-karthik.188@gmail.com> (raw)
In-Reply-To: <1433574581-23980-1-git-send-email-karthik.188@gmail.com>
Introduce filter_refs() which will act as an API for users to
call and provide a function which will iterate over a set of refs
while filtering out the required refs.
Currently this will wrap around ref_filter_handler(). Hence,
ref_filter_handler is made file scope static.
Helped-by: Junio C Hamano <gitster@pobox.com>
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
---
builtin/for-each-ref.c | 2 +-
ref-filter.c | 12 +++++++++++-
ref-filter.h | 8 ++++++--
3 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index e237194..2a16947 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -56,7 +56,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
memset(&ref_cbdata, 0, sizeof(ref_cbdata));
ref_cbdata.filter.name_patterns = argv;
- for_each_rawref(ref_filter_handler, &ref_cbdata);
+ filter_refs(for_each_rawref, &ref_cbdata);
ref_array_sort(sort, &ref_cbdata.array);
diff --git a/ref-filter.c b/ref-filter.c
index 95e72f6..c32b86f 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -843,7 +843,7 @@ static struct ref_array_item *new_ref_array_item(const char *refname,
* A call-back given to for_each_ref(). Filter refs and keep them for
* later object processing.
*/
-int ref_filter_handler(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
+static int ref_filter_handler(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
{
struct ref_filter_cbdata *ref_cbdata = cb_data;
struct ref_filter *filter = &ref_cbdata->filter;
@@ -889,6 +889,16 @@ void ref_array_clear(struct ref_array *array)
array->nr = array->alloc = 0;
}
+/*
+ * API for filtering a set of refs. The refs are provided and iterated
+ * over using the for_each_ref_fn(). The refs are stored into and filtered
+ * based on the ref_filter_cbdata structure.
+ */
+int filter_refs(int (for_each_ref_fn)(each_ref_fn, void *), struct ref_filter_cbdata *data)
+{
+ return for_each_ref_fn(ref_filter_handler, data);
+}
+
static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, struct ref_array_item *b)
{
struct atom_value *va, *vb;
diff --git a/ref-filter.h b/ref-filter.h
index 1432ff6..15e6766 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -46,8 +46,12 @@ struct ref_filter_cbdata {
struct ref_filter filter;
};
-/* Callback function for for_each_*ref(). This filters the refs based on the filters set */
-int ref_filter_handler(const char *refname, const unsigned char *sha1, int flag, void *cb_data);
+/*
+ * API for filtering a set of refs. The refs are provided and iterated
+ * over using the for_each_ref_fn(). The refs are stored into and filtered
+ * based on the ref_filter_cbdata structure.
+ */
+int filter_refs(int (for_each_ref_fn)(each_ref_fn, void *), struct ref_filter_cbdata *data);
/* Clear all memory allocated to ref_array */
void ref_array_clear(struct ref_array *array);
/* Parse format string and sort specifiers */
--
2.4.2
next prev parent reply other threads:[~2015-06-06 7:10 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-06 7:04 [WIP/PATCH v5 0/10] create ref-filter from for-each-ref Karthik Nayak
2015-06-06 7:09 ` [WIP/PATCH v5 01/10] for-each-ref: extract helper functions out of grab_single_ref() Karthik Nayak
2015-06-06 7:09 ` [WIP/PATCH v5 02/10] for-each-ref: clean up code Karthik Nayak
2015-06-08 14:37 ` Matthieu Moy
2015-06-08 15:21 ` Karthik Nayak
2015-06-08 16:23 ` Matthieu Moy
2015-06-06 7:09 ` [WIP/PATCH v5 03/10] for-each-ref: rename 'refinfo' to 'ref_array_item' Karthik Nayak
2015-06-08 14:42 ` Matthieu Moy
2015-06-08 15:19 ` Karthik Nayak
2015-06-06 7:09 ` [WIP/PATCH v5 04/10] for-each-ref: introduce new structures for better organisation Karthik Nayak
2015-06-06 7:09 ` [WIP/PATCH v5 05/10] for-each-ref: introduce 'ref_array_clear()' Karthik Nayak
2015-06-08 14:53 ` Matthieu Moy
2015-06-08 15:18 ` Karthik Nayak
2015-06-08 15:18 ` Karthik Nayak
2015-06-08 16:26 ` Matthieu Moy
2015-06-08 17:05 ` Junio C Hamano
2015-06-08 17:21 ` Matthieu Moy
2015-06-08 20:19 ` Karthik Nayak
2015-06-09 6:31 ` Matthieu Moy
2015-06-06 7:09 ` [WIP/PATCH v5 06/10] for-each-ref: rename some functions and make them public Karthik Nayak
2015-06-06 7:09 ` [WIP/PATCH v5 07/10] ref-filter: add 'ref-filter.h' Karthik Nayak
2015-06-06 7:09 ` [WIP/PATCH v5 08/10] ref-filter: move code from 'for-each-ref' Karthik Nayak
2015-06-06 7:09 ` Karthik Nayak [this message]
2015-06-06 7:09 ` [WIP/PATCH v5 10/10] ref-filter: make 'ref_array_item' use a FLEX_ARRAY for refname Karthik Nayak
2015-06-06 9:40 ` [WIP/PATCH v5 0/10] create ref-filter from for-each-ref Christian Couder
2015-06-06 10:53 ` Karthik Nayak
2015-06-06 11:26 ` Karthik Nayak
Reply instructions:
You may reply publicly 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1433574581-23980-9-git-send-email-karthik.188@gmail.com \
--to=karthik.188@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).