git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: christian.couder@gmail.com, Matthieu.Moy@grenoble-inp.fr,
	gitster@pobox.com, Karthik Nayak <Karthik.188@gmail.com>,
	Karthik Nayak <karthik.188@gmail.com>
Subject: [PATCH 6/9] ref-filter: introduce format_ref_array_item()
Date: Fri,  2 Oct 2015 23:09:03 +0530	[thread overview]
Message-ID: <1443807546-5985-7-git-send-email-Karthik.188@gmail.com> (raw)
In-Reply-To: <1443807546-5985-1-git-send-email-Karthik.188@gmail.com>

Introduce format_ref_array_item() which will output the details of a
given ref_array_item as per the given format and quote_style to the
given strbuf.

This is derived from show_ref_array_item() which is now reduced to a
wrapper around format_ref_array_item().  show_ref_array_item() obtains
the strbuf and prints it the standard output.

This is needed when we port over the printing options of ref-filter to
branch.c.

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>
---
 ref-filter.c | 16 ++++++++++++----
 ref-filter.h |  3 +++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ref-filter.c b/ref-filter.c
index 15df421..099acd6 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1748,10 +1748,10 @@ static void append_literal(const char *cp, const char *ep, struct ref_formatting
 	}
 }
 
-void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style)
+void format_ref_array_item(struct ref_array_item *info, const char *format,
+			   int quote_style, struct strbuf *final_buf)
 {
 	const char *cp, *sp, *ep;
-	struct strbuf *final_buf;
 	struct ref_formatting_state state = REF_FORMATTING_STATE_INIT;
 
 	state.quote_style = quote_style;
@@ -1781,9 +1781,17 @@ void show_ref_array_item(struct ref_array_item *info, const char *format, int qu
 	}
 	if (state.stack->prev)
 		die(_("format: %%(end) atom missing"));
-	final_buf = &state.stack->output;
-	fwrite(final_buf->buf, 1, final_buf->len, stdout);
+	strbuf_addbuf(final_buf, &state.stack->output);
 	pop_stack_element(&state.stack);
+}
+
+void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style)
+{
+	struct strbuf final_buf = STRBUF_INIT;
+
+	format_ref_array_item(info, format, quote_style, &final_buf);
+	fwrite(final_buf.buf, 1, final_buf.len, stdout);
+	strbuf_release(&final_buf);
 	putchar('\n');
 }
 
diff --git a/ref-filter.h b/ref-filter.h
index 14d435e..e0b26e8 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -98,6 +98,9 @@ int parse_ref_filter_atom(const char *atom, const char *ep);
 int verify_ref_format(const char *format);
 /*  Sort the given ref_array as per the ref_sorting provided */
 void ref_array_sort(struct ref_sorting *sort, struct ref_array *array);
+/*  Based on the given format and quote_style, fill the strbuf */
+void format_ref_array_item(struct ref_array_item *info, const char *format,
+			   int quote_style, struct strbuf *final_buf);
 /*  Print the ref using the given format and quote_style */
 void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style);
 /*  Callback function for parsing the sort option */
-- 
2.6.0

  parent reply	other threads:[~2015-10-02 17:39 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-02 17:38 [PATCH 0/9] port branch.c to use ref-filter printing APIs Karthik Nayak
2015-10-02 17:38 ` [PATCH 1/9] ref-filter: implement %(if), %(then), and %(else) atoms Karthik Nayak
2015-10-02 20:45   ` Junio C Hamano
2015-10-03  7:05     ` Karthik Nayak
2015-10-03  9:39   ` Matthieu Moy
2015-10-03 17:01     ` Junio C Hamano
2015-10-04  8:02       ` Matthieu Moy
2015-10-04 17:21         ` Junio C Hamano
2015-10-04 13:59     ` Karthik Nayak
2015-10-02 17:38 ` [PATCH 2/9] ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>) Karthik Nayak
2015-10-02 20:54   ` Junio C Hamano
2015-10-03  7:14     ` Karthik Nayak
2015-10-02 17:39 ` [PATCH 3/9] ref-filter: add support for %(path) atom Karthik Nayak
2015-10-03 10:02   ` Matthieu Moy
2015-10-04 17:07     ` Karthik Nayak
2015-10-04 17:51       ` Matthieu Moy
2015-10-04 18:44         ` Junio C Hamano
2015-10-05  6:40           ` Matthieu Moy
2015-10-04 19:12         ` Karthik Nayak
2015-10-02 17:39 ` [PATCH 4/9] ref-filter: modify "%(objectname:short)" to take length Karthik Nayak
2015-10-02 21:02   ` Junio C Hamano
2015-10-03  7:28     ` Karthik Nayak
2015-10-02 17:39 ` [PATCH 5/9] ref-filter: adopt get_head_description() from branch.c Karthik Nayak
2015-10-02 17:39 ` Karthik Nayak [this message]
2015-10-03 12:02   ` [PATCH 6/9] ref-filter: introduce format_ref_array_item() Matthieu Moy
2015-10-05  7:49     ` Karthik Nayak
2015-10-05  8:49       ` Matthieu Moy
2015-10-06 19:16         ` Karthik Nayak
2015-10-06 19:38           ` Matthieu Moy
2015-10-06 19:50             ` Karthik Nayak
2015-10-02 17:39 ` [PATCH 7/9] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams Karthik Nayak
2015-10-03 12:08   ` Matthieu Moy
2015-10-05  7:49     ` Karthik Nayak
2015-10-02 17:39 ` [PATCH 8/9] branch: use ref-filter printing APIs Karthik Nayak
2015-10-03 12:41   ` Matthieu Moy
2015-10-05 17:46     ` Karthik Nayak
2015-10-05 18:43       ` Matthieu Moy
2015-10-06 15:30         ` Karthik Nayak
2015-10-06 19:03           ` Matthieu Moy
2015-10-07 16:47             ` Karthik Nayak
2015-10-07 17:58               ` Matthieu Moy
2015-10-07 18:02                 ` Karthik Nayak
2015-10-02 17:39 ` [PATCH 9/9] branch: implement '--format' option 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=1443807546-5985-7-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 \
    --cc=gitster@pobox.com \
    /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).