From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, sunshine@sunshineco.com,
Karthik Nayak <Karthik.188@gmail.com>
Subject: [PATCH v3 06/15] ref-fitler: bump match_atom() name to the top
Date: Tue, 5 Jan 2016 13:33:05 +0530 [thread overview]
Message-ID: <1451980994-26865-7-git-send-email-Karthik.188@gmail.com> (raw)
In-Reply-To: <1451980994-26865-1-git-send-email-Karthik.188@gmail.com>
Bump match_atom() to the top for usage in further patches.
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
---
ref-filter.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index efa247a..575d293 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -33,6 +33,22 @@ static struct used_atom {
static int used_atom_cnt, need_tagged, need_symref;
static int need_color_reset_at_eol;
+static int match_atom_name(const char *name, const char *atom_name, const char **val)
+{
+ const char *body;
+
+ if (!skip_prefix(name, atom_name, &body))
+ return 0; /* doesn't even begin with "atom_name" */
+ if (!body[0]) {
+ *val = NULL; /* %(atom_name) and no customization */
+ return 1;
+ }
+ if (body[0] != ':')
+ return 0; /* "atom_namefoo" is not "atom_name" or "atom_name:..." */
+ *val = body + 1; /* "atom_name:val" */
+ return 1;
+}
+
static struct {
const char *name;
cmp_type cmp_type;
@@ -262,22 +278,6 @@ static void end_atom_handler(struct atom_value *atomv, struct ref_formatting_sta
pop_stack_element(&state->stack);
}
-static int match_atom_name(const char *name, const char *atom_name, const char **val)
-{
- const char *body;
-
- if (!skip_prefix(name, atom_name, &body))
- return 0; /* doesn't even begin with "atom_name" */
- if (!body[0]) {
- *val = NULL; /* %(atom_name) and no customization */
- return 1;
- }
- if (body[0] != ':')
- return 0; /* "atom_namefoo" is not "atom_name" or "atom_name:..." */
- *val = body + 1; /* "atom_name:val" */
- return 1;
-}
-
/*
* In a format string, find the next occurrence of %(atom).
*/
--
2.6.4
next prev parent reply other threads:[~2016-01-05 8:03 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-05 8:02 [PATCH v3 00/15] ref-filter: use parsing functions Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 01/15] strbuf: introduce strbuf_split_str_omit_term() Karthik Nayak
2016-01-05 19:24 ` Junio C Hamano
2016-01-06 7:27 ` Karthik Nayak
2016-01-21 19:47 ` Eric Sunshine
2016-01-25 6:12 ` Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 02/15] ref-filter: use strbuf_split_str_omit_term() Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 03/15] ref-filter: bump 'used_atom' and related code to the top Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 04/15] ref-filter: introduce struct used_atom Karthik Nayak
2016-01-21 19:04 ` Eric Sunshine
2016-01-25 6:13 ` Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 05/15] ref-filter: introduce parsing functions for each valid atom Karthik Nayak
2016-01-05 8:03 ` Karthik Nayak [this message]
2016-01-05 8:03 ` [PATCH v3 07/15] ref-filter: skip deref specifier in match_atom_name() Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 08/15] ref-filter: introduce color_atom_parser() Karthik Nayak
2016-01-05 20:49 ` Junio C Hamano
2016-01-06 7:52 ` Karthik Nayak
2016-01-05 21:06 ` Junio C Hamano
2016-01-06 10:16 ` Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 09/15] ref-filter: introduce align_atom_parser() Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 10/15] ref-filter: introduce parse_align_position() Karthik Nayak
2016-01-25 21:49 ` Eric Sunshine
2016-01-26 11:34 ` Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 11/15] ref-filter: convert variable 'width' to an unsigned int Karthik Nayak
2016-01-05 21:12 ` Junio C Hamano
2016-01-06 10:17 ` Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 12/15] ref-filter: align: introduce long-form syntax Karthik Nayak
2016-01-25 22:58 ` Eric Sunshine
2016-01-25 23:45 ` Junio C Hamano
2016-01-26 9:40 ` Karthik Nayak
2016-01-26 9:30 ` Karthik Nayak
2016-01-26 5:16 ` Christian Couder
2016-01-26 9:39 ` Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 13/15] ref-filter: introduce remote_ref_atom_parser() Karthik Nayak
2016-01-26 0:28 ` Eric Sunshine
2016-01-26 10:02 ` Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 14/15] ref-filter: introduce contents_atom_parser() Karthik Nayak
2016-01-05 21:22 ` Junio C Hamano
2016-01-06 18:22 ` Karthik Nayak
2016-01-07 18:04 ` Junio C Hamano
2016-01-07 20:03 ` Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 15/15] ref-filter: introduce objectname_atom_parser() Karthik Nayak
2016-01-05 21:31 ` Junio C Hamano
2016-01-06 18:27 ` Karthik Nayak
2016-01-06 21:14 ` [PATCH v3 00/15] ref-filter: use parsing functions Eric Sunshine
2016-01-07 14:25 ` Karthik Nayak
2016-01-07 18:43 ` Junio C Hamano
2016-01-07 20:20 ` Karthik Nayak
2016-01-07 20:36 ` Eric Sunshine
2016-01-07 20:44 ` Karthik Nayak
2016-01-07 21:28 ` Junio C Hamano
2016-01-09 9:00 ` 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=1451980994-26865-7-git-send-email-Karthik.188@gmail.com \
--to=karthik.188@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.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).